summaryrefslogtreecommitdiff
path: root/core/src/tbox
diff options
context:
space:
mode:
authorruki <[email protected]>2019-01-17 22:51:37 +0800
committerruki <[email protected]>2019-01-17 11:09:44 +0800
commiteb91261789a1f11e9114709571b11a918902a819 (patch)
treebfdf621dce7bba547d32e383a4972635e16980ba /core/src/tbox
parent6e7bedfc63217b0e1d02a55b01de6f5e5457ec1a (diff)
fix build version
Diffstat (limited to 'core/src/tbox')
-rw-r--r--core/src/tbox/src/tbox/xmake.lua21
1 files changed, 13 insertions, 8 deletions
diff --git a/core/src/tbox/src/tbox/xmake.lua b/core/src/tbox/src/tbox/xmake.lua
index 961e27365..b21eb34af 100644
--- a/core/src/tbox/src/tbox/xmake.lua
+++ b/core/src/tbox/src/tbox/xmake.lua
@@ -8,17 +8,22 @@ target("tbox")
add_defines("__tb_prefix__=\"tbox\"")
-- set the auto-generated config.h
- set_config_header("$(buildir)/tbox/tbox.config.h", {prefix = "TB_CONFIG", version = "1.6.2", build = "%Y%m%d%H%M"})
+ set_config_header("$(buildir)/$(plat)/$(arch)/$(mode)/tbox.config.h", {prefix = "TB_CONFIG", version = "1.6.2", buildversion = "%Y%m%d%H%M"})
- -- add includes directory
- add_includedirs("$(buildir)")
- add_includedirs("$(buildir)/tbox")
+ -- add include directories
+ add_includedirs("..")
+ add_includedirs("$(buildir)/$(plat)/$(arch)/$(mode)")
+
+ -- add public header directories
+ add_headerdirs("..")
+ add_headerdirs("$(buildir)/$(plat)/$(arch)/$(mode)")
-- add the header files for installing
- add_headers("../(tbox/**.h)|**/impl/**.h")
- add_headers("../(tbox/prefix/**/prefix.S)")
- add_headers("../(tbox/math/impl/*.h)")
- add_headers("../(tbox/utils/impl/*.h)")
+ add_headerfiles("../(tbox/**.h)|**/impl/**.h")
+ add_headerfiles("../(tbox/prefix/**/prefix.S)")
+ add_headerfiles("../(tbox/math/impl/*.h)")
+ add_headerfiles("../(tbox/utils/impl/*.h)")
+ add_headerfiles("$(buildir)/$(plat)/$(arch)/$(mode)/tbox.config.h", {prefixdir = "tbox"})
-- add packages
add_options("zlib", "mysql", "sqlite3", "openssl", "polarssl", "mbedtls", "pcre2", "pcre")