From 5c4b98ecca5a0c437a1bb5679e4046f752ed1a42 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 2 Dec 2025 22:49:56 +0800 Subject: improve c++/objc++ rules --- xmake/rules/objc++/config/basic.lua | 42 +++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 xmake/rules/objc++/config/basic.lua (limited to 'xmake/rules/objc++/config/basic.lua') diff --git a/xmake/rules/objc++/config/basic.lua b/xmake/rules/objc++/config/basic.lua new file mode 100644 index 000000000..cf1da1e12 --- /dev/null +++ b/xmake/rules/objc++/config/basic.lua @@ -0,0 +1,42 @@ +--!A cross-platform build utility based on Lua +-- +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- +-- Copyright (C) 2015-present, Xmake Open Source Community. +-- +-- @author ruki +-- @file basic.lua +-- + +-- main entry +function main(target, sourcekind) + -- objc basic configs + if sourcekind == "mm" then + -- deprecated, we only need to use `add_mflags("-fno-objc-arc")` to override it + if target:values("objc.build.arc") == false then + target:add("mflags", "-fno-objc-arc") + end + if target:is_plat("macosx", "iphoneos", "watchos") then + target:add("frameworks", "Foundation", "CoreFoundation") + end + elseif sourcekind == "mxx" then + -- deprecated, we only need to use `add_mxxflags("-fno-objc-arc")` to override it + if target:values("objc++.build.arc") == false then + target:add("mxxflags", "-fno-objc-arc") + end + if target:is_plat("macosx", "iphoneos", "watchos") then + target:add("frameworks", "Foundation", "CoreFoundation") + end + end +end + -- cgit v1.3.1 From 9d7699a185cf459b33782fc314c39fdd848de816 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 2 Dec 2025 22:57:33 +0800 Subject: improve basic --- xmake/rules/objc++/config/basic.lua | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'xmake/rules/objc++/config/basic.lua') diff --git a/xmake/rules/objc++/config/basic.lua b/xmake/rules/objc++/config/basic.lua index cf1da1e12..4da2eed43 100644 --- a/xmake/rules/objc++/config/basic.lua +++ b/xmake/rules/objc++/config/basic.lua @@ -18,22 +18,16 @@ -- @file basic.lua -- --- main entry function main(target, sourcekind) - -- objc basic configs - if sourcekind == "mm" then - -- deprecated, we only need to use `add_mflags("-fno-objc-arc")` to override it - if target:values("objc.build.arc") == false then - target:add("mflags", "-fno-objc-arc") - end - if target:is_plat("macosx", "iphoneos", "watchos") then - target:add("frameworks", "Foundation", "CoreFoundation") - end - elseif sourcekind == "mxx" then - -- deprecated, we only need to use `add_mxxflags("-fno-objc-arc")` to override it - if target:values("objc++.build.arc") == false then - target:add("mxxflags", "-fno-objc-arc") + if sourcekind == "mm" or sourcekind == "mxx" then + -- deprecated, we only need to use `add_mflags("-fno-objc-arc")` or `add_mxxflags("-fno-objc-arc")` to override it + local arc_value = sourcekind == "mm" and target:values("objc.build.arc") or target:values("objc++.build.arc") + if arc_value == false then + local flag_name = sourcekind == "mm" and "mflags" or "mxxflags" + target:add(flag_name, "-fno-objc-arc") end + + -- add frameworks for Apple platforms if target:is_plat("macosx", "iphoneos", "watchos") then target:add("frameworks", "Foundation", "CoreFoundation") end -- cgit v1.3.1