summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorruki <[email protected]>2017-08-05 23:12:23 +0800
committerruki <[email protected]>2017-08-05 23:12:23 +0800
commit80d60243e2af2587ebac63b1d3ba42919a263ea9 (patch)
tree8c2fee91c5da675f6a1c4e97844a37fcd57c09f3 /core
parent72f68f941f9b6d07f71811fe403a2dc178270af0 (diff)
modify core xmake file
Diffstat (limited to 'core')
-rw-r--r--core/src/demo/xmake.lua2
-rw-r--r--core/src/xmake/xmake.lua3
2 files changed, 2 insertions, 3 deletions
diff --git a/core/src/demo/xmake.lua b/core/src/demo/xmake.lua
index 9f4fd2f0d..40d089f7f 100644
--- a/core/src/demo/xmake.lua
+++ b/core/src/demo/xmake.lua
@@ -36,6 +36,6 @@ target("demo")
-- add the resource files (it will be enabled after publishing new version)
if is_plat("windows") then
--- add_files("*.rc")
+ add_files("*.rc")
end
diff --git a/core/src/xmake/xmake.lua b/core/src/xmake/xmake.lua
index c50013e4b..484d94b98 100644
--- a/core/src/xmake/xmake.lua
+++ b/core/src/xmake/xmake.lua
@@ -11,8 +11,7 @@ target("xmake")
add_defines("__tb_prefix__=\"xmake\"")
-- set the auto-generated config.h
- set_config_h("$(projectdir)/xmake.config.h")
- set_config_h_prefix("XM_CONFIG")
+ set_config_header("$(projectdir)/xmake.config.h", {prefix = "XM_CONFIG"})
-- set the object files directory
set_objectdir("$(buildir)/.objs")