Add arm64 builds for Mac

scp-fs2open · Jun 1, 2022 · 78d3124 · 78d3124
1 parent 98827f5
commit 78d3124
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/build-nightly.yaml b/.github/workflows/build-nightly.yaml
@@ -216,7 +216,7 @@ jobs:
       matrix:
         configuration: [FastDebug, Release]
         compiler: [clang]
-        arch: [x86_64]
+        arch: [x86_64, arm64]
     name: Mac
     runs-on: macos-latest
     steps:

diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
@@ -315,7 +315,7 @@ jobs:
       matrix:
         configuration: [FastDebug, Release]
         compiler: [clang]
-        arch: [x86_64]
+        arch: [x86_64, arm64]
     name: Mac
     needs: create_release
     runs-on: macos-latest

diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
@@ -230,7 +230,7 @@ jobs:
       matrix:
         configuration: [FastDebug, Release]
         compiler: [clang]
-        arch: [x86_64]
+        arch: [x86_64, arm64]
     name: Mac
     runs-on: macos-latest
     steps:

diff --git a/.github/workflows/test-pull_request.yaml b/.github/workflows/test-pull_request.yaml
@@ -162,7 +162,7 @@ jobs:
       matrix:
         configuration: [Debug, Release]
         compiler: [clang]
-        arch: [x86_64]
+        arch: [x86_64, arm64]
         cmake_options: [""]
     name: Mac
     runs-on: macos-latest

diff --git a/lib/freetype.cmake b/lib/freetype.cmake
@@ -1,7 +1,7 @@
 
 add_library(freetype INTERFACE)
 
-if(PLATFORM_WINDOWS OR PLATFORM_MAC)
+if(PLATFORM_WINDOWS)
 	# We use prebuilt binaries for windows and mac
 	get_prebuilt_path(PREBUILT_PATH)
 	set(FREETYPE_ROOT_DIR "${PREBUILT_PATH}/freetype")

diff --git a/lib/libpng/CMakeLists.txt b/lib/libpng/CMakeLists.txt
@@ -41,6 +41,8 @@ IF (FSO_BUILD_INCLUDED_LIBS OR NOT PNG_FOUND)
 	target_include_directories(png SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 	target_compile_definitions(png PRIVATE "_CRT_SECURE_NO_WARNINGS;$<$<CONFIG:Debug>:PNG_DEBUG=1>")
+	target_compile_definitions(png PRIVATE PNG_ARM_NEON_IMPLEMENTATION=0) # Disable NEON to fix Mac ARM builds
+	target_compile_definitions(png PRIVATE PNG_ARM_NEON_OPT=0)
 
 	IF(BUILD_SHARED_LIBS)
 		target_compile_definitions(png INTERFACE PNG_BUILD_DLL)