summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2017-04-05 09:52:07 +0800
committerruki <[email protected]>2017-04-05 09:52:07 +0800
commit9f65a2f1b69d54a4d15d135f4b3058a989a57429 (patch)
treec8d258b08b9394ca9695d06bc97d71b295878da6
parent70917a211cca30ea2165bc2b22879748824f9ee3 (diff)
add frameworks for c++
-rw-r--r--xmake/languages/c++/api.lua2
-rw-r--r--xmake/languages/c++/xmake.lua12
2 files changed, 14 insertions, 0 deletions
diff --git a/xmake/languages/c++/api.lua b/xmake/languages/c++/api.lua
index 65ce02967..436d75628 100644
--- a/xmake/languages/c++/api.lua
+++ b/xmake/languages/c++/api.lua
@@ -154,6 +154,7 @@ function apis()
, "target.add_undefines"
, "target.add_defines_h"
, "target.add_undefines_h"
+ , "target.add_frameworks"
-- option.add_xxx
, "option.add_cincludes"
, "option.add_cxxincludes"
@@ -176,6 +177,7 @@ function apis()
, "option.add_undefines_h"
, "option.add_undefines_if_ok"
, "option.add_undefines_h_if_ok"
+ , "option.add_frameworks"
}
_g.pathes =
{
diff --git a/xmake/languages/c++/xmake.lua b/xmake/languages/c++/xmake.lua
index cb40ac094..ca18654cd 100644
--- a/xmake/languages/c++/xmake.lua
+++ b/xmake/languages/c++/xmake.lua
@@ -52,6 +52,7 @@ language("c++")
object =
{
"config.includedirs"
+ , "config.frameworks"
, "target.symbols"
, "target.warnings"
, "target.optimize:check"
@@ -60,6 +61,7 @@ language("c++")
, "target.includedirs"
, "target.defines"
, "target.undefines"
+ , "target.frameworks"
, "option.symbols"
, "option.warnings"
, "option.optimize:check"
@@ -70,9 +72,11 @@ language("c++")
, "option.undefines"
, "option.defines_if_ok"
, "option.undefines_if_ok"
+ , "option.frameworks"
, "platform.includedirs"
, "platform.defines"
, "platform.undefines"
+ , "platform.frameworks"
}
, binary =
{
@@ -88,9 +92,13 @@ language("c++")
, "platform.linkdirs"
, "platform.rpathdirs"
, "config.links"
+ , "config.frameworks"
, "target.links"
+ , "target.frameworks"
, "option.links"
+ , "option.frameworks"
, "platform.links"
+ , "platform.frameworks"
}
, shared =
{
@@ -103,9 +111,13 @@ language("c++")
, "option.linkdirs"
, "platform.linkdirs"
, "config.links"
+ , "config.frameworks"
, "target.links"
+ , "target.frameworks"
, "option.links"
+ , "option.frameworks"
, "platform.links"
+ , "platform.frameworks"
}
, static =
{