diff options
| -rw-r--r-- | xmake/actions/config/menuconf.lua | 16 | ||||
| -rw-r--r-- | xmake/languages/c++/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/languages/objc++/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/languages/swift/xmake.lua | 4 |
4 files changed, 21 insertions, 7 deletions
diff --git a/xmake/actions/config/menuconf.lua b/xmake/actions/config/menuconf.lua index 0fe0be4f1..19c1bb840 100644 --- a/xmake/actions/config/menuconf.lua +++ b/xmake/actions/config/menuconf.lua @@ -198,7 +198,21 @@ function app:_basic_configs(cache) -- make configs by category self._BASIC_CONFIGS = self:_make_configs_by_category(options_by_category, function (opt) - return {name = opt[2] or opt[1], kind = (opt[3] == "k") and "boolean" or "string", default = opt[4], description = opt[5]} + local description = {} + for i = 5, 64 do + local desc = opt[i] + if type(desc) == "function" then + desc = desc() + end + if type(desc) == "string" then + table.insert(description, desc) + elseif type(desc) == "table" then + table.join2(description, desc) + else + break + end + end + return {name = opt[2] or opt[1], kind = (opt[3] == "k") and "boolean" or "string", default = opt[4], description = description} end) return self._BASIC_CONFIGS end diff --git a/xmake/languages/c++/xmake.lua b/xmake/languages/c++/xmake.lua index f96fcfd14..34ed07fc8 100644 --- a/xmake/languages/c++/xmake.lua +++ b/xmake/languages/c++/xmake.lua @@ -170,8 +170,8 @@ language("c++") , {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" } + , {nil, "frameworks", "kv", nil, "The Frameworks" } + , {nil, "frameworkdirs", "kv", nil, "The Frameworks Search Directories" } } } diff --git a/xmake/languages/objc++/xmake.lua b/xmake/languages/objc++/xmake.lua index cfb26e528..d2fff34a8 100644 --- a/xmake/languages/objc++/xmake.lua +++ b/xmake/languages/objc++/xmake.lua @@ -170,8 +170,8 @@ 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 Include and Link Frameworks" } - , {nil, "frameworkdirs", "kv", nil, "The Include and Link Frameworks Search Directories" } + , {nil, "frameworks", "kv", nil, "The Frameworks" } + , {nil, "frameworkdirs", "kv", nil, "The Frameworks Search Directories" } } } diff --git a/xmake/languages/swift/xmake.lua b/xmake/languages/swift/xmake.lua index f392831c4..b1e47e7b5 100644 --- a/xmake/languages/swift/xmake.lua +++ b/xmake/languages/swift/xmake.lua @@ -153,8 +153,8 @@ 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 Include and Link Frameworks" } - , { nil, "frameworkdirs", "kv", nil, "The Include and Link Frameworks Search Directories" } + , { nil, "frameworks", "kv", nil, "The Frameworks" } + , { nil, "frameworkdirs", "kv", nil, "The Frameworks Search Directories" } } } |