improve templates with tbox

14 files changed, 8 insertions, 34 deletions

diff --git a/xmake/templates/c++/console_tbox/project/src/xmake.lua b/xmake/templates/c++/console_tbox/project/src/xmake.lua
index 35acd7238..73adf9675 100644
--- a/xmake/templates/c++/console_tbox/project/src/xmake.lua
+++ b/xmake/templates/c++/console_tbox/project/src/xmake.lua
@@ -7,9 +7,6 @@ target("[targetname]")
     -- add defines
     add_defines("__tb_prefix__=\"[targetname]\"")
 
-    -- set the auto-generated config.h
-    set_config_header("$(buildir)/[targetname].config.h", {prefix = "CONFIG"})
-
     -- add packages
     add_packages("tbox")
 
diff --git a/xmake/templates/c++/shared_library_tbox/project/src/_library/interface.h b/xmake/templates/c++/shared_library_tbox/project/src/_library/interface.h
index 513cce181..944af8121 100644
--- a/xmake/templates/c++/shared_library_tbox/project/src/_library/interface.h
+++ b/xmake/templates/c++/shared_library_tbox/project/src/_library/interface.h
@@ -4,7 +4,6 @@
 /* //////////////////////////////////////////////////////////////////////////////////////
  * includes
  */
-#include "config.h"
 #include "tbox/tbox.h"
 
 /* //////////////////////////////////////////////////////////////////////////////////////
diff --git a/xmake/templates/c++/shared_library_tbox/project/src/_library/xmake.lua b/xmake/templates/c++/shared_library_tbox/project/src/_library/xmake.lua
index 46de512d1..4f564356b 100644
--- a/xmake/templates/c++/shared_library_tbox/project/src/_library/xmake.lua
+++ b/xmake/templates/c++/shared_library_tbox/project/src/_library/xmake.lua
@@ -7,15 +7,11 @@ target("[targetname]")
     -- add defines
     add_defines("__tb_prefix__=\"[targetname]\"")
 
-    -- set the auto-generated config.h
-    set_config_header("$(buildir)/[targetname]/config.h", {prefix = "CONFIG"})
-
     -- add the header files for installing
     add_headerfiles("../([targetname]/**.h)")
 
     -- add includes directory
-    add_includedirs("$(buildir)")
-    add_includedirs("$(buildir)/[targetname]")
+    add_includedirs("..", {interface = true})
 
     -- add packages
     add_packages("tbox")
diff --git a/xmake/templates/c++/shared_library_tbox/project/xmake.lua b/xmake/templates/c++/shared_library_tbox/project/xmake.lua
index 7a9c99391..1ebaa6e34 100644
--- a/xmake/templates/c++/shared_library_tbox/project/xmake.lua
+++ b/xmake/templates/c++/shared_library_tbox/project/xmake.lua
@@ -1,5 +1,5 @@
 -- version
-set_xmakever("2.2.2")
+set_xmakever("2.2.5")
 
 -- set warning all as error
 set_warnings("all", "error")
diff --git a/xmake/templates/c++/static_library_tbox/project/src/_library/interface.h b/xmake/templates/c++/static_library_tbox/project/src/_library/interface.h
index c8c62ac70..f4f4a07e1 100644
--- a/xmake/templates/c++/static_library_tbox/project/src/_library/interface.h
+++ b/xmake/templates/c++/static_library_tbox/project/src/_library/interface.h
@@ -4,7 +4,6 @@
 /* //////////////////////////////////////////////////////////////////////////////////////
  * includes
  */
-#include "config.h"
 #include "tbox/tbox.h"
 
 /* //////////////////////////////////////////////////////////////////////////////////////
diff --git a/xmake/templates/c++/static_library_tbox/project/src/_library/xmake.lua b/xmake/templates/c++/static_library_tbox/project/src/_library/xmake.lua
index 07fc61acf..71a5e698f 100644
--- a/xmake/templates/c++/static_library_tbox/project/src/_library/xmake.lua
+++ b/xmake/templates/c++/static_library_tbox/project/src/_library/xmake.lua
@@ -7,15 +7,11 @@ target("[targetname]")
     -- add defines
     add_defines("__tb_prefix__=\"[targetname]\"")
 
-    -- set the auto-generated config.h
-    set_config_header("$(buildir)/[targetname]/config.h", {prefix = "CONFIG"})
-
     -- add the header files for installing
     add_headerfiles("../([targetname]/**.h)")
 
     -- add includes directory
-    add_includedirs("$(buildir)")
-    add_includedirs("$(buildir)/[targetname]")
+    add_includedirs("..", {interface = true})
 
     -- add packages
     add_packages("tbox")
diff --git a/xmake/templates/c++/static_library_tbox/project/xmake.lua b/xmake/templates/c++/static_library_tbox/project/xmake.lua
index 7a9c99391..1ebaa6e34 100644
--- a/xmake/templates/c++/static_library_tbox/project/xmake.lua
+++ b/xmake/templates/c++/static_library_tbox/project/xmake.lua
@@ -1,5 +1,5 @@
 -- version
-set_xmakever("2.2.2")
+set_xmakever("2.2.5")
 
 -- set warning all as error
 set_warnings("all", "error")
diff --git a/xmake/templates/c/console_tbox/project/src/xmake.lua b/xmake/templates/c/console_tbox/project/src/xmake.lua
index aeb4f9320..3f528a7ec 100644
--- a/xmake/templates/c/console_tbox/project/src/xmake.lua
+++ b/xmake/templates/c/console_tbox/project/src/xmake.lua
@@ -7,9 +7,6 @@ target("[targetname]")
     -- add defines
     add_defines("__tb_prefix__=\"[targetname]\"")
 
-    -- set the auto-generated config.h
-    set_config_header("$(buildir)/[targetname].config.h", {prefix = "CONFIG"})
-
     -- add packages
     add_packages("tbox")
 
diff --git a/xmake/templates/c/shared_library_tbox/project/src/_library/interface.h b/xmake/templates/c/shared_library_tbox/project/src/_library/interface.h
index 513cce181..944af8121 100644
--- a/xmake/templates/c/shared_library_tbox/project/src/_library/interface.h
+++ b/xmake/templates/c/shared_library_tbox/project/src/_library/interface.h
@@ -4,7 +4,6 @@
 /* //////////////////////////////////////////////////////////////////////////////////////
  * includes
  */
-#include "config.h"
 #include "tbox/tbox.h"
 
 /* //////////////////////////////////////////////////////////////////////////////////////
diff --git a/xmake/templates/c/shared_library_tbox/project/src/_library/xmake.lua b/xmake/templates/c/shared_library_tbox/project/src/_library/xmake.lua
index 65e855f2b..cb36ba3b8 100644
--- a/xmake/templates/c/shared_library_tbox/project/src/_library/xmake.lua
+++ b/xmake/templates/c/shared_library_tbox/project/src/_library/xmake.lua
@@ -7,15 +7,11 @@ target("[targetname]")
     -- add defines
     add_defines("__tb_prefix__=\"[targetname]\"")
 
-    -- set the auto-generated config.h
-    set_config_header("$(buildir)/[targetname]/config.h", {prefix = "CONFIG"})
-
     -- add the header files for installing
     add_headerfiles("../([targetname]/**.h)")
 
     -- add includes directory
-    add_includedirs("$(buildir)")
-    add_includedirs("$(buildir)/[targetname]")
+    add_includedirs("..", {interface = true})
 
     -- add packages
     add_packages("tbox")
diff --git a/xmake/templates/c/shared_library_tbox/project/xmake.lua b/xmake/templates/c/shared_library_tbox/project/xmake.lua
index 7a9c99391..1ebaa6e34 100644
--- a/xmake/templates/c/shared_library_tbox/project/xmake.lua
+++ b/xmake/templates/c/shared_library_tbox/project/xmake.lua
@@ -1,5 +1,5 @@
 -- version
-set_xmakever("2.2.2")
+set_xmakever("2.2.5")
 
 -- set warning all as error
 set_warnings("all", "error")
diff --git a/xmake/templates/c/static_library_tbox/project/src/_library/interface.h b/xmake/templates/c/static_library_tbox/project/src/_library/interface.h
index c8c62ac70..f4f4a07e1 100644
--- a/xmake/templates/c/static_library_tbox/project/src/_library/interface.h
+++ b/xmake/templates/c/static_library_tbox/project/src/_library/interface.h
@@ -4,7 +4,6 @@
 /* //////////////////////////////////////////////////////////////////////////////////////
  * includes
  */
-#include "config.h"
 #include "tbox/tbox.h"
 
 /* //////////////////////////////////////////////////////////////////////////////////////
diff --git a/xmake/templates/c/static_library_tbox/project/src/_library/xmake.lua b/xmake/templates/c/static_library_tbox/project/src/_library/xmake.lua
index 29c60e912..45967cabc 100644
--- a/xmake/templates/c/static_library_tbox/project/src/_library/xmake.lua
+++ b/xmake/templates/c/static_library_tbox/project/src/_library/xmake.lua
@@ -7,15 +7,11 @@ target("[targetname]")
     -- add defines
     add_defines("__tb_prefix__=\"[targetname]\"")
 
-    -- set the auto-generated config.h
-    set_config_header("$(buildir)/[targetname]/config.h", {prefix = "CONFIG"})
-
     -- add the header files for installing
     add_headerfiles("../([targetname]/**.h)")
 
     -- add includes directory
-    add_includedirs("$(buildir)")
-    add_includedirs("$(buildir)/[targetname]")
+    add_includedirs("..", {interface = true})
 
     -- add packages
     add_packages("tbox")
diff --git a/xmake/templates/c/static_library_tbox/project/xmake.lua b/xmake/templates/c/static_library_tbox/project/xmake.lua
index 7a9c99391..1ebaa6e34 100644
--- a/xmake/templates/c/static_library_tbox/project/xmake.lua
+++ b/xmake/templates/c/static_library_tbox/project/xmake.lua
@@ -1,5 +1,5 @@
 -- version
-set_xmakever("2.2.2")
+set_xmakever("2.2.5")
 
 -- set warning all as error
 set_warnings("all", "error")