Commit 7be3d924 authored by nanahira's avatar nanahira

Merge branch 'master' into server

parents 8d02eb88 f9c55082
Pipeline #15258 passed with stages
in 3 minutes and 31 seconds
...@@ -205,7 +205,6 @@ if os.istarget("macosx") then ...@@ -205,7 +205,6 @@ if os.istarget("macosx") then
if GetParam("mac-arm") then if GetParam("mac-arm") then
MAC_ARM = true MAC_ARM = true
end end
ON_MAC_ARM = MAC_ARM or os.outputof("arch") == "arm64"
end end
if GetParam("server-mode") then if GetParam("server-mode") then
SERVER_MODE = true SERVER_MODE = true
...@@ -278,7 +277,7 @@ end ...@@ -278,7 +277,7 @@ end
filter { "configurations:Release", "not action:vs*" } filter { "configurations:Release", "not action:vs*" }
symbols "On" symbols "On"
defines "NDEBUG" defines "NDEBUG"
if not ON_MAC_ARM then if not MAC_ARM then
buildoptions "-march=native" buildoptions "-march=native"
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment