diff options
| author | ruki <[email protected]> | 2017-02-09 09:22:25 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-02-09 09:22:25 +0800 |
| commit | fd16730ec4846ea1acf8cb03d91f0a059d98fddf (patch) | |
| tree | 2e4b09d80a62b0edb2dd4ff0f1a035dd6e591503 /xmake/languages | |
| parent | 7bb2d3b070b62c5fce22276c92f342f2647b0a39 (diff) | |
add add_frameworks api
Diffstat (limited to 'xmake/languages')
| -rw-r--r-- | xmake/languages/objc++/api.lua | 2 | ||||
| -rwxr-xr-x | xmake/languages/objc++/xmake.lua | 10 | ||||
| -rw-r--r-- | xmake/languages/swift/api.lua | 2 | ||||
| -rwxr-xr-x | xmake/languages/swift/xmake.lua | 9 |
4 files changed, 22 insertions, 1 deletions
diff --git a/xmake/languages/objc++/api.lua b/xmake/languages/objc++/api.lua index 789f14605..82040a313 100644 --- a/xmake/languages/objc++/api.lua +++ b/xmake/languages/objc++/api.lua @@ -42,6 +42,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" @@ -62,6 +63,7 @@ function apis() , "option.add_undefines" , "option.add_undefines_if_ok" , "option.add_undefines_h_if_ok" + , "option.add_frameworks" } _g.pathes = { diff --git a/xmake/languages/objc++/xmake.lua b/xmake/languages/objc++/xmake.lua index 1557630ad..0919a8d7c 100755 --- a/xmake/languages/objc++/xmake.lua +++ b/xmake/languages/objc++/xmake.lua @@ -49,6 +49,7 @@ language("objc++") compiler = { "config.includedirs" + , "config.frameworks" , "target.symbols" , "target.warnings" , "target.optimize:check" @@ -57,6 +58,7 @@ language("objc++") , "target.includedirs" , "target.defines" , "target.undefines" + , "target.frameworks" , "option.symbols" , "option.warnings" , "option.optimize:check" @@ -67,9 +69,11 @@ language("objc++") , "option.undefines" , "option.defines_if_ok" , "option.undefines_if_ok" + , "option.frameworks" , "platform.includedirs" , "platform.defines" , "platform.undefines" + , "platform.frameworks" } , linker = { @@ -82,9 +86,13 @@ language("objc++") , "option.linkdirs" , "platform.linkdirs" , "config.links" + , "config.frameworks" , "target.links" + , "target.frameworks" , "option.links" + , "option.frameworks" , "platform.links" + , "platform.frameworks" } , archiver = { @@ -116,7 +124,7 @@ language("objc++") , {nil, "links", "kv", nil, "The Link Libraries" } , {nil, "linkdirs", "kv", nil, "The Link Search Directories" } , {nil, "includedirs","kv", nil, "The Include Search Directories" } - + , {nil, "frameworks", "kv", nil, "The Link Frameworks" } } } diff --git a/xmake/languages/swift/api.lua b/xmake/languages/swift/api.lua index 88d371630..63e1ddbfd 100644 --- a/xmake/languages/swift/api.lua +++ b/xmake/languages/swift/api.lua @@ -34,12 +34,14 @@ function apis() , "target.add_ldflags" , "target.add_arflags" , "target.add_shflags" + , "target.add_frameworks" -- option.add_xxx , "option.add_links" , "option.add_scflags" , "option.add_ldflags" , "option.add_arflags" , "option.add_shflags" + , "option.add_frameworks" } _g.pathes = { diff --git a/xmake/languages/swift/xmake.lua b/xmake/languages/swift/xmake.lua index 1a4409bd2..261039895 100755 --- a/xmake/languages/swift/xmake.lua +++ b/xmake/languages/swift/xmake.lua @@ -46,6 +46,7 @@ language("swift") compiler = { "config.includedirs" + , "config.Frameworks" , "target.symbols" , "target.warnings" , "target.optimize:check" @@ -54,6 +55,7 @@ language("swift") , "target.includedirs" , "target.defines" , "target.undefines" + , "target.frameworks" , "option.symbols" , "option.warnings" , "option.optimize:check" @@ -64,9 +66,11 @@ language("swift") , "option.undefines" , "option.defines_if_ok" , "option.undefines_if_ok" + , "option.frameworks" , "platform.includedirs" , "platform.defines" , "platform.undefines" + , "platform.frameworks" } , linker = { @@ -79,9 +83,13 @@ language("swift") , "option.linkdirs" , "platform.linkdirs" , "config.links" + , "config.frameworks" , "target.links" + , "target.frameworks" , "option.links" + , "option.frameworks" , "platform.links" + , "platform.frameworks" } , archiver = { @@ -114,6 +122,7 @@ language("swift") , {nil, "links", "kv", nil, "The Link Libraries" } , {nil, "linkdirs", "kv", nil, "The Link Search Directories" } , {nil, "includedirs","kv", nil, "The Include Search Directories" } + , {nil, "frameworks", "kv", nil, "The Link Frameworks" } } } |
