From 8a798c8b4edb9c8e9367722b911e5f22f751e112 Mon Sep 17 00:00:00 2001 From: Diamante Date: Sat, 8 Feb 2025 18:09:54 +0100 Subject: [PATCH] build: add amd64 macos (#80) --- .github/workflows/build.yml | 1 + deps/premake/libtomcrypt.lua | 14 ++++++-------- premake5.lua | 5 +++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a41f048..bad9951 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -129,6 +129,7 @@ jobs: - debug - release arch: + - x64 - arm64 steps: - name: Check out files diff --git a/deps/premake/libtomcrypt.lua b/deps/premake/libtomcrypt.lua index d6a7713..06578cf 100644 --- a/deps/premake/libtomcrypt.lua +++ b/deps/premake/libtomcrypt.lua @@ -54,15 +54,13 @@ function libtomcrypt.project() "_USRDLL", } - if os.istarget("darwin") then - filter "platforms:x64" - buildoptions "-march=native" - filter {} + filter { "system:macosx", "platforms:arm64" } + buildoptions "-mcpu=apple-m1" + filter {} - filter "platforms:arm64" - buildoptions "-mcpu=apple-m1" - filter {} - end + filter { "system:macosx", "platforms:x64" } + buildoptions "-mcpu=x86-64" + filter {} warnings "Off" kind "StaticLib" diff --git a/premake5.lua b/premake5.lua index a2228cd..42a13e5 100644 --- a/premake5.lua +++ b/premake5.lua @@ -86,6 +86,11 @@ if os.istarget("linux") then filter {} end +filter { "system:macosx", "platforms:x64" } + buildoptions "-arch x86_64" + linkoptions "-arch x86_64" +filter {} + filter { "system:macosx", "platforms:arm64" } buildoptions "-arch arm64" linkoptions "-arch arm64"