summaryrefslogtreecommitdiff
path: root/xmake/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'xmake/scripts')
-rw-r--r--xmake/scripts/base/package.lua4
-rw-r--r--xmake/scripts/platform/linux/linux.lua4
-rw-r--r--xmake/scripts/platform/macosx/macosx.lua4
3 files changed, 10 insertions, 2 deletions
diff --git a/xmake/scripts/base/package.lua b/xmake/scripts/base/package.lua
index f4be5595c..37b6e7c1f 100644
--- a/xmake/scripts/base/package.lua
+++ b/xmake/scripts/base/package.lua
@@ -119,11 +119,11 @@ add_option("[targetname]")
add_option_cincludes("[targetname]/[targetname].h")
-- add include directories
- add_option_includedirs("inc", "inc/$(plat)/$(arch)")
+ add_option_includedirs("inc/$(plat)", "inc")
]]
-- save file
- file:write(template:gsub("%[targetname%]", target.name):gsub("%[TARGETNAME%]", target.name:upper()))
+ file:write((template:gsub("%[targetname%]", target.name):gsub("%[TARGETNAME%]", target.name:upper())))
-- exit file
file:close()
diff --git a/xmake/scripts/platform/linux/linux.lua b/xmake/scripts/platform/linux/linux.lua
index 82b934ee4..62ff0d04c 100644
--- a/xmake/scripts/platform/linux/linux.lua
+++ b/xmake/scripts/platform/linux/linux.lua
@@ -71,6 +71,10 @@ function linux.make(configs)
configs.ldflags = { archflags }
configs.shflags = { archflags }
+ -- init linkdirs and includedirs
+ configs.linkdirs = {"/usr/lib", "/usr/local/lib"}
+ configs.includedirs = {"/usr/include", "/usr/local/include"}
+
end
-- get the option menu for action: xmake config or global
diff --git a/xmake/scripts/platform/macosx/macosx.lua b/xmake/scripts/platform/macosx/macosx.lua
index 6e08778d5..9168d9ae3 100644
--- a/xmake/scripts/platform/macosx/macosx.lua
+++ b/xmake/scripts/platform/macosx/macosx.lua
@@ -78,6 +78,10 @@ function macosx.make(configs)
table.insert(configs.shflags, "-isysroot " .. xcode_sdkdir)
end
+ -- init linkdirs and includedirs
+ configs.linkdirs = {"/usr/lib", "/usr/local/lib"}
+ configs.includedirs = {"/usr/include", "/usr/local/include"}
+
end
-- get the option menu for action: xmake config or global