summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-03-20 00:12:14 +0800
committerruki <[email protected]>2020-03-19 19:13:24 +0800
commitce3f5dcee88458f46c97fffec3bca2d8bbea7e7e (patch)
treed6a91aa6b0fae2e791916d59e870425feae1cbff
parent99fab9be3f0aa4928a3bfea12e3a7c812c3dae64 (diff)
fix includedirs for package
-rw-r--r--xmake/languages/asm/api.lua5
-rw-r--r--xmake/languages/c++/api.lua7
-rw-r--r--xmake/languages/dlang/api.lua5
3 files changed, 7 insertions, 10 deletions
diff --git a/xmake/languages/asm/api.lua b/xmake/languages/asm/api.lua
index d159eee0b..807e5f4a7 100644
--- a/xmake/languages/asm/api.lua
+++ b/xmake/languages/asm/api.lua
@@ -54,6 +54,8 @@ function apis()
, "package.add_defines"
, "package.add_undefines"
, "package.add_rpathdirs"
+ , "package.add_linkdirs"
+ , "package.add_includedirs"
}
_g.pathes =
{
@@ -66,9 +68,6 @@ function apis()
-- option.add_xxx
, "option.add_linkdirs"
, "option.add_includedirs"
- -- package.add_xxx
- , "package.add_linkdirs"
- , "package.add_includedirs"
}
-- ok
diff --git a/xmake/languages/c++/api.lua b/xmake/languages/c++/api.lua
index ceecb3fc2..6ffb55ad5 100644
--- a/xmake/languages/c++/api.lua
+++ b/xmake/languages/c++/api.lua
@@ -214,6 +214,9 @@ function apis()
, "package.add_undefines"
, "package.add_frameworks"
, "package.add_rpathdirs"
+ , "package.add_linkdirs"
+ , "package.add_includedirs" --@note we need not uses pathes for package, see https://github.com/xmake-io/xmake/issues/717
+ , "package.add_frameworkdirs"
}
_g.pathes =
{
@@ -234,10 +237,6 @@ function apis()
, "option.add_linkdirs"
, "option.add_includedirs"
, "option.add_frameworkdirs"
- -- package.add_xxx
- , "package.add_linkdirs"
- , "package.add_includedirs"
- , "package.add_frameworkdirs"
}
_g.dictionary =
{
diff --git a/xmake/languages/dlang/api.lua b/xmake/languages/dlang/api.lua
index b2fe3612c..d3dd6ec1f 100644
--- a/xmake/languages/dlang/api.lua
+++ b/xmake/languages/dlang/api.lua
@@ -48,6 +48,8 @@ function apis()
, "package.add_arflags"
, "package.add_shflags"
, "package.add_rpathdirs"
+ , "package.add_linkdirs"
+ , "package.add_includedirs"
}
_g.pathes =
{
@@ -57,9 +59,6 @@ function apis()
-- option.add_xxx
, "option.add_linkdirs"
, "option.add_includedirs"
- -- package.add_xxx
- , "package.add_linkdirs"
- , "package.add_includedirs"
}
-- ok