diff options
| author | ruki <[email protected]> | 2017-07-15 20:14:13 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-07-15 20:14:13 +0800 |
| commit | 52fe9fc2ad2dbd0c25a873b7a297259d8af102a9 (patch) | |
| tree | 716e07410c585b9c7eb3ed1201aea79a3982e49a /xmake/languages/objc++ | |
| parent | c3576499ce8251ce6bf8610eb7b2b67d3e34a61b (diff) | |
add_frameworkdirs api
Diffstat (limited to 'xmake/languages/objc++')
| -rw-r--r-- | xmake/languages/objc++/api.lua | 2 | ||||
| -rw-r--r-- | xmake/languages/objc++/xmake.lua | 53 |
2 files changed, 35 insertions, 20 deletions
diff --git a/xmake/languages/objc++/api.lua b/xmake/languages/objc++/api.lua index ef1731cd1..4c6d8fc75 100644 --- a/xmake/languages/objc++/api.lua +++ b/xmake/languages/objc++/api.lua @@ -75,10 +75,12 @@ function apis() , "target.add_linkdirs" , "target.add_rpathdirs" , "target.add_includedirs" + , "target.add_frameworkdirs" -- option.add_xxx , "option.add_linkdirs" , "option.add_rpathdirs" , "option.add_includedirs" + , "option.add_frameworkdirs" } -- ok diff --git a/xmake/languages/objc++/xmake.lua b/xmake/languages/objc++/xmake.lua index 8ba0dc135..0f5cb3b0a 100644 --- a/xmake/languages/objc++/xmake.lua +++ b/xmake/languages/objc++/xmake.lua @@ -55,6 +55,7 @@ language("objc++") object = { "config.includedirs" + , "config.frameworkdirs" , "config.frameworks" , "target.symbols" , "target.warnings" @@ -64,6 +65,7 @@ language("objc++") , "target.includedirs" , "target.defines" , "target.undefines" + , "target.frameworkdirs" , "target.frameworks" , "option.symbols" , "option.warnings" @@ -75,25 +77,31 @@ language("objc++") , "option.undefines" , "option.defines_if_ok" , "option.undefines_if_ok" + , "option.frameworkdirs" , "option.frameworks" , "platform.includedirs" , "platform.defines" , "platform.undefines" + , "platform.frameworkdirs" , "platform.frameworks" } , binary = { "config.linkdirs" + , "config.frameworkdirs" , "target.linkdirs" , "target.rpathdirs" + , "target.frameworkdirs" , "target.strip" , "target.symbols" , "option.strip" , "option.symbols" , "option.linkdirs" , "option.rpathdirs" + , "option.frameworkdirs" , "platform.linkdirs" , "platform.rpathdirs" + , "platform.frameworkdirs" , "config.links" , "config.frameworks" , "target.links" @@ -106,13 +114,17 @@ language("objc++") , shared = { "config.linkdirs" + , "config.frameworkdirs" , "target.linkdirs" + , "target.frameworkdirs" , "target.strip" , "target.symbols" , "option.strip" , "option.symbols" , "option.linkdirs" + , "option.frameworkdirs" , "platform.linkdirs" + , "platform.frameworkdirs" , "config.links" , "config.frameworks" , "target.links" @@ -133,30 +145,31 @@ language("objc++") set_menu { config = { - {} - , {nil, "mm", "kv", nil, "The Objc Compiler" } - , {nil, "mxx", "kv", nil, "The Objc++ Compiler" } - , {nil, "mflags", "kv", nil, "The Objc Compiler Flags" } - , {nil, "mxflags", "kv", nil, "The Objc/c++ Compiler Flags" } - , {nil, "mxxflags", "kv", nil, "The Objc++ Compiler Flags" } + { } + , {nil, "mm", "kv", nil, "The Objc Compiler" } + , {nil, "mxx", "kv", nil, "The Objc++ Compiler" } + , {nil, "mflags", "kv", nil, "The Objc Compiler Flags" } + , {nil, "mxflags", "kv", nil, "The Objc/c++ Compiler Flags" } + , {nil, "mxxflags", "kv", nil, "The Objc++ Compiler Flags" } - , {} - , {nil, "ld", "kv", nil, "The Linker" } - , {nil, "ldflags", "kv", nil, "The Binary Linker Flags" } + , { } + , {nil, "ld", "kv", nil, "The Linker" } + , {nil, "ldflags", "kv", nil, "The Binary Linker Flags" } - , {} - , {nil, "ar", "kv", nil, "The Static Library Linker" } - , {nil, "arflags", "kv", nil, "The Static Library Linker Flags" } + , { } + , {nil, "ar", "kv", nil, "The Static Library Linker" } + , {nil, "arflags", "kv", nil, "The Static Library Linker Flags" } - , {} - , {nil, "sh", "kv", nil, "The Shared Library Linker" } - , {nil, "shflags", "kv", nil, "The Shared Library Linker Flags" } + , { } + , {nil, "sh", "kv", nil, "The Shared Library Linker" } + , {nil, "shflags", "kv", nil, "The Shared Library Linker Flags" } - , {} - , {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" } + , { } + , {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 Include and Link Frameworks" } + , {nil, "frameworkdirs", "kv", nil, "The Include and Link Frameworks Search Directories" } } } |