Skip to content

Y
ygopro-core
Commit 3b7867c1 authored by nanahira's avatar nanahira
Browse files
Options

remove mac-arm

parent 5669c08b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 10 deletions
.gitlab-ci.yml
View file @ 3b7867c1
...@@ -137,7 +137,6 @@ build_macos_m1: ...@@ -137,7 +137,6 @@ build_macos_m1:
variables: variables:
BUILD_TYPE: arm64 BUILD_TYPE: arm64
DIST_PATH: build/bin/arm64/Release DIST_PATH: build/bin/arm64/Release
MAC_ARM: '1'
build_macos: build_macos:
stage: combine stage: combine
......
premake/dll.lua
View file @ 3b7867c1
newoption { trigger = "lua-dir", description = "", value = "PATH", default = "./lua" } newoption { trigger = "lua-dir", description = "", value = "PATH", default = "./lua" }
newoption { trigger = "wasm", description = "" } newoption { trigger = "wasm", description = "" }
newoption { trigger = "mac-arm", description = "" }
function GetParam(param) function GetParam(param)
return _OPTIONS[param] or os.getenv(string.upper(string.gsub(param,"-","_"))) return _OPTIONS[param] or os.getenv(string.upper(string.gsub(param,"-","_")))
...@@ -21,14 +20,8 @@ workspace "ocgcoredll" ...@@ -21,14 +20,8 @@ workspace "ocgcoredll"
if WASM then if WASM then
toolset "emcc" toolset "emcc"
platforms { "wasm" } platforms { "wasm" }
elseif os.istarget("macosx") then else
if GetParam("mac-arm") then platforms { "x32", "x64", "arm64" }
platforms { "arm64" }
else
platforms { "x64" }
end
else
platforms { "x32", "x64" }
end end
filter "platforms:x32" filter "platforms:x32"
...@@ -37,6 +30,9 @@ workspace "ocgcoredll" ...@@ -37,6 +30,9 @@ workspace "ocgcoredll"
filter "platforms:x64" filter "platforms:x64"
architecture "x64" architecture "x64"
filter "platforms:arm64"
architecture "ARM64"
filter "configurations:Release" filter "configurations:Release"
optimize "Speed" optimize "Speed"
......
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