From 87af3d4f2238039908dd6e4cd4ad72554a9aeab9 Mon Sep 17 00:00:00 2001
From: fG! <reverser@put.as>
Date: Tue, 15 Jul 2025 16:23:59 +0100
Subject: [PATCH] Fix scripts and Xcode project to build on Apple Silicon

---
 ResourceConverter/generate.sh           | 3 +++
 WhateverGreen.xcodeproj/project.pbxproj | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ResourceConverter/generate.sh b/ResourceConverter/generate.sh
index 4e68824f..4f8cf9ef 100644
--- a/ResourceConverter/generate.sh
+++ b/ResourceConverter/generate.sh
@@ -9,6 +9,9 @@ ret=0
 
 rm -f "${PROJECT_DIR}/WhateverGreen/kern_resources.cpp"
 
+# xcode only signs the binaries after all build phases so we can't use the binary we built on this phase on Apple Silicon 
+/usr/bin/codesign --force --sign - --timestamp\=none "${TARGET_BUILD_DIR}/ResourceConverter"
+
 "${TARGET_BUILD_DIR}/ResourceConverter" \
 	"${PROJECT_DIR}/Resources" \
 	"${PROJECT_DIR}/WhateverGreen/kern_resources.cpp" \
diff --git a/WhateverGreen.xcodeproj/project.pbxproj b/WhateverGreen.xcodeproj/project.pbxproj
index 1c60d6bc..10cda549 100644
--- a/WhateverGreen.xcodeproj/project.pbxproj
+++ b/WhateverGreen.xcodeproj/project.pbxproj
@@ -727,6 +727,7 @@
 		CE7FC0C220F6821600138088 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "${ARCHS_STANDARD}";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++1y";
@@ -745,6 +746,7 @@
 		CE7FC0C320F6821600138088 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "${ARCHS_STANDARD}";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++1y";
@@ -764,7 +766,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = x86_64;
+				ARCHS = "${ARCHS_STANDARD}";
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++1y";
 				CLANG_CXX_LIBRARY = "libc++";