improve headerfiles in core/xmake.lua

4 files changed, 18 insertions, 1 deletions

diff --git a/core/src/demo/xmake.lua b/core/src/demo/xmake.lua
index 4e7c0b1af..6eeb0c771 100644
--- a/core/src/demo/xmake.lua
+++ b/core/src/demo/xmake.lua
@@ -1,6 +1,11 @@
 -- add target
 target("demo")
 
+    -- disable this target if only build libaries
+    if has_config("onlylib") then
+        set_default(false)
+    end
+
     -- add deps
     add_deps("xmake")
 
diff --git a/core/src/luajit/xmake.lua b/core/src/luajit/xmake.lua
index a26b11e67..cb204daf6 100644
--- a/core/src/luajit/xmake.lua
+++ b/core/src/luajit/xmake.lua
@@ -21,7 +21,7 @@ target("luajit")
     end
 
     -- add header files
-    add_headerfiles("luajit/src/(*.h)")
+    add_headerfiles("luajit/src/(*.h)", {prefixdir = "luajit"})
 
     -- add include directories
     add_includedirs(autogendir)
diff --git a/core/src/xmake/xmake.lua b/core/src/xmake/xmake.lua
index 36f8131e1..df9bbe11d 100644
--- a/core/src/xmake/xmake.lua
+++ b/core/src/xmake/xmake.lua
@@ -21,6 +21,11 @@ target("xmake")
     add_includedirs("..", {interface = true})
     add_includedirs("$(buildir)/$(plat)/$(arch)/$(mode)", {public = true})
 
+    -- add header files
+    add_headerfiles("../(xmake/*.h)")
+    add_headerfiles("../(xmake/prefix/*.h)")
+    add_headerfiles("$(buildir)/$(plat)/$(arch)/$(mode)/xmake.config.h", {prefixdir = "xmake"})
+
     -- add the common source files
     add_files("**.c|winos/*.c")
     if is_plat("windows", "msys", "cygwin") then
diff --git a/core/xmake.lua b/core/xmake.lua
index 590e1f482..7178d8b5e 100644
--- a/core/xmake.lua
+++ b/core/xmake.lua
@@ -49,6 +49,13 @@ option("curses")
     add_defines("XM_CONFIG_API_HAVE_CURSES")
 option_end()
 
+-- only build xmake libraries for development?
+option("onlylib")
+    set_default(false)
+    set_showmenu(true)
+    set_description("Only build xmake libraries for development")
+option_end()
+
 -- suppress warnings
 if is_plat("windows") then
     add_defines("_CRT_SECURE_NO_WARNINGS")