From 82c2ee867dc33097800caa4d25ab44aa1696517b Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 20 Aug 2022 20:58:52 +0800 Subject: use catalyst for macosx --- xmake/toolchains/xcode/load_iphoneos.lua | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'xmake/toolchains/xcode/load_iphoneos.lua') diff --git a/xmake/toolchains/xcode/load_iphoneos.lua b/xmake/toolchains/xcode/load_iphoneos.lua index d64172ed2..77a581b0c 100644 --- a/xmake/toolchains/xcode/load_iphoneos.lua +++ b/xmake/toolchains/xcode/load_iphoneos.lua @@ -29,21 +29,15 @@ function main(toolchain) local xcode_sdkver = toolchain:config("xcode_sdkver") local xcode_sysroot = toolchain:config("xcode_sysroot") + -- is simulator? + local simulator = toolchain:config("appledev") == "simulator" + -- init target minimal version - local appledev = toolchain:config("appledev") local target_minver = toolchain:config("target_minver") if target_minver and tonumber(target_minver) > 10 and (arch == "armv7" or arch == "armv7s" or arch == "i386") then target_minver = "10" -- iOS 10 is the maximum deployment target for 32-bit targets end - if target_minver and tonumber(target_minver) < 13 and appledev == "catalyst" then - target_minver = "13.1" - end - local target_minver_flags - if appledev == "simulator" then - target_minver_flags = "-mios-simulator-version-min=" .. target_minver - else - target_minver_flags = "-miphoneos-version-min=" .. target_minver - end + local target_minver_flags = (simulator and "-mios-simulator-version-min=" or "-miphoneos-version-min=") .. target_minver -- init flags for c/c++ toolchain:add("cxflags", "-arch", arch, target_minver_flags, "-isysroot", xcode_sysroot) -- cgit v1.3.1