aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2025-04-02 23:45:18 +0200
committerGitHub Enterprise <[email protected]>2025-04-02 23:45:18 +0200
commit1751e189e7c71b801bd7e805cda18a48556b1d4f (patch)
tree60eb7b1fa0503a2d2c2b7093d2fc774c2361bdf9
parentchangelog (diff)
downloadzen-1751e189e7c71b801bd7e805cda18a48556b1d4f.tar.xz
zen-1751e189e7c71b801bd7e805cda18a48556b1d4f.zip
remove xcode 12.1 workaround (#339)
* remove xcode 12.1 workaround * bump min macos version to 14.0
-rw-r--r--scripts/bundle.lua4
-rw-r--r--xmake.lua6
2 files changed, 2 insertions, 8 deletions
diff --git a/scripts/bundle.lua b/scripts/bundle.lua
index 1a81c9b7f..3ca9b7ae4 100644
--- a/scripts/bundle.lua
+++ b/scripts/bundle.lua
@@ -214,8 +214,8 @@ end
--------------------------------------------------------------------------------
local function main_mac(signidentity)
-- Build and universalify
- _build("x86_64", false, "--target_minver=12.5")
- _build("arm64", false, "--target_minver=12.5")
+ _build("x86_64", false, "--target_minver=14.0")
+ _build("arm64", false, "--target_minver=14.0")
os.mkdir("build/macosx/universal/release/")
local ret = _exec(
diff --git a/xmake.lua b/xmake.lua
index 103ca6703..9b433689d 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -98,12 +98,6 @@ if is_os("windows") then
-- add_ldflags("/MAP")
end
-if is_os("macosx") then
- -- temporary workaround for xcode 12.1 (UE minimum spec is 12.5)
- -- TODO: once CI is updated we should remove this
- add_defines("_LIBCPP_DISABLE_AVAILABILITY")
-end
-
if is_os("linux") or is_os("macosx") then
add_cxxflags("-Wno-implicit-fallthrough")
add_cxxflags("-Wno-missing-field-initializers")