diff --git a/lib_acl/xmake.lua b/lib_acl/xmake.lua index cee60f208..7272f2ac3 100644 --- a/lib_acl/xmake.lua +++ b/lib_acl/xmake.lua @@ -8,11 +8,11 @@ target("acl") add_files("src/**.c|*/bak/*.c") -- add include directories - add_includedirs(".", "include") + add_includedirs(".") + add_includedirs("include", {public = true}) -- add headers add_headerfiles("include/(**.h)") - -- set_headerdir("$(buildir)/include/acl") -- add defines add_defines("USE_REUSEPORT") diff --git a/lib_acl_cpp/xmake.lua b/lib_acl_cpp/xmake.lua index 3aa744e25..feabd01c4 100644 --- a/lib_acl_cpp/xmake.lua +++ b/lib_acl_cpp/xmake.lua @@ -16,13 +16,11 @@ target("acl_cpp") add_includedirs("$(projectdir)/include/mysql") add_includedirs("$(projectdir)/include/pgsql") add_includedirs("$(projectdir)/include/sqlite") - add_includedirs("$(projectdir)/lib_acl/include") - add_includedirs("$(projectdir)/lib_protocol/include") - add_includedirs("src", "include") + add_includedirs("src") + add_includedirs("include", {public = true}) -- add headers add_headerfiles("include/(**.h)", "include/(**.hpp)", "include/(**.ipp)") - -- set_headerdir("$(buildir)/include/acl_cpp") -- set precompile header set_pcxxheader("src/acl_stdafx.hpp") diff --git a/lib_fiber/c/xmake.lua b/lib_fiber/c/xmake.lua index e7f5565d0..f70383beb 100644 --- a/lib_fiber/c/xmake.lua +++ b/lib_fiber/c/xmake.lua @@ -4,18 +4,15 @@ target("fiber") -- set kind: static/shared set_kind("$(kind)") - -- add deps: acl - -- add_deps("acl") - -- add source files add_files("src/**.c") -- add include directories - add_includedirs("src", "include") + add_includedirs("src") + add_includedirs("include", {public = true}) -- add headers add_headerfiles("include/(**.h)") - -- set_headerdir("$(buildir)/include/fiber") -- add flags add_cxflags("-std=gnu99") diff --git a/lib_fiber/cpp/xmake.lua b/lib_fiber/cpp/xmake.lua index b85f56d76..d817619e1 100644 --- a/lib_fiber/cpp/xmake.lua +++ b/lib_fiber/cpp/xmake.lua @@ -11,15 +11,11 @@ target("fiber_cpp") add_files("src/**.cpp") -- add include directories - add_includedirs("src", "include") - add_includedirs("$(projectdir)/lib_fiber/c/include") - add_includedirs("$(projectdir)/lib_acl/include") - add_includedirs("$(projectdir)/lib_acl_cpp/include") + add_includedirs("src") + add_includedirs("include", {public = true}) -- add headers add_headerfiles("include/(**.h)", "include/(**.hpp)") - add_includedirs("src", "include", "../../lib_acl/src/master") - -- set_headerdir("$(buildir)/include/fiber_cpp") diff --git a/lib_protocol/xmake.lua b/lib_protocol/xmake.lua index 32b4c5601..c113fc9fd 100644 --- a/lib_protocol/xmake.lua +++ b/lib_protocol/xmake.lua @@ -11,12 +11,11 @@ target("protocol") add_files("src/**.c") -- add include directories - add_includedirs("src", "include") - add_includedirs("$(projectdir)/lib_acl/include") + add_includedirs("src") + add_includedirs("include", {public = true}) -- add headers add_headerfiles("include/(**.h)") - -- set_headerdir("$(buildir)/include/protocol")