From b043d9eb23c8086aa4f70b060e4041c2971c8bcc Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Tue, 21 Apr 2020 23:45:36 +0800
Subject: improve headerfiles in core/xmake.lua

---
 core/src/demo/xmake.lua   | 5 +++++
 core/src/luajit/xmake.lua | 2 +-
 core/src/xmake/xmake.lua  | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'core/src')

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
-- 
cgit v1.3.1