Commit 175c80e0 authored by Nanahira's avatar Nanahira Committed by GitHub

use premake mac from github release & remove Rosetta thing (#43)

parent 99982e8d
...@@ -528,9 +528,17 @@ jobs: ...@@ -528,9 +528,17 @@ jobs:
brew install opus opusfile libvorbis brew install opus opusfile libvorbis
# brew install sqlite libx11 freetype libevent # brew install sqlite libx11 freetype libevent
- name: Install premake - name: Download premake
id: premake
uses: mercury233/action-cache-download-file@v1.0.0
with:
url: https://github.com/premake/premake-core/releases/download/v5.0.0-beta7/premake-5.0.0-beta7-macosx.tar.gz
filename: premake5.tar.gz
- name: Extract premake
run: | run: |
brew install premake tar xf ${{ steps.premake.outputs.filepath }}
chmod +x ./premake5
- name: Download libevent - name: Download libevent
if: matrix.static-link == true if: matrix.static-link == true
...@@ -662,12 +670,12 @@ jobs: ...@@ -662,12 +670,12 @@ jobs:
- name: Use premake to generate make files (Homebrew packages) - name: Use premake to generate make files (Homebrew packages)
if: matrix.static-link != true if: matrix.static-link != true
run: | run: |
DYLD_LIBRARY_PATH=$(brew --prefix)/lib premake5 gmake DYLD_LIBRARY_PATH=$(brew --prefix)/lib ./premake5 gmake
- name: Use premake to generate make files (static link) - name: Use premake to generate make files (static link)
if: matrix.static-link == true if: matrix.static-link == true
run: | run: |
premake5 gmake ${{ matrix.cross-build-intel == true && '--mac-intel' || '' }} ${{ matrix.cross-build-arm == true && '--mac-arm' || '' }} \ ./premake5 gmake ${{ matrix.cross-build-intel == true && '--mac-intel' || '' }} ${{ matrix.cross-build-arm == true && '--mac-arm' || '' }} \
--build-event \ --build-event \
--build-freetype \ --build-freetype \
--build-sqlite \ --build-sqlite \
...@@ -684,4 +692,4 @@ jobs: ...@@ -684,4 +692,4 @@ jobs:
with: with:
name: YGOPro-${{ matrix.name }} name: YGOPro-${{ matrix.name }}
path: | path: |
bin/release/YGOPro.app bin/release/YGOPro
...@@ -244,18 +244,9 @@ if os.istarget("macosx") then ...@@ -244,18 +244,9 @@ if os.istarget("macosx") then
if GetParam("mac-intel") then if GetParam("mac-intel") then
MAC_INTEL = true MAC_INTEL = true
end end
if MAC_ARM or (not MAC_INTEL and os.hostarch() == "ARM64") then
if MAC_ARM then -- building on ARM CPU will target ARM automatically
TARGET_MAC_ARM = true TARGET_MAC_ARM = true
elseif not MAC_INTEL then
-- automatic target arm64, need extra detect
-- currently, os.hostarch cannot detect architectures that have been automatically translated by macOS
local uname = os.outputof("uname -m")
local proctranslated = os.outputof("sysctl sysctl.proc_translated")
if uname:find("arm") or proctranslated then
print("Detected Apple Silicon Mac")
TARGET_MAC_ARM = true
end
end end
end end
...@@ -320,11 +311,7 @@ workspace "YGOPro" ...@@ -320,11 +311,7 @@ workspace "YGOPro"
targetdir "bin/debug/x64" targetdir "bin/debug/x64"
filter { "configurations:Release", "action:vs*" } filter { "configurations:Release", "action:vs*" }
if linktimeoptimization then -- available since premake 5.0-beta4 linktimeoptimization "On"
linktimeoptimization "On"
else
flags { "LinkTimeOptimization" }
end
staticruntime "On" staticruntime "On"
disablewarnings { "4244", "4267", "4838", "4996", "6011", "6031", "6054", "6262" } disablewarnings { "4244", "4267", "4838", "4996", "6011", "6031", "6054", "6262" }
......
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