Skip to content

Commit 0faa499

Browse files
authored
Merge pull request #1 from acidanthera/master
Fix scripts and Xcode project to build on Apple Silicon (acidanthera#123)
2 parents bb37170 + bd6fb18 commit 0faa499

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

ResourceConverter/generate.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ ret=0
99

1010
rm -f "${PROJECT_DIR}/WhateverGreen/kern_resources.cpp"
1111

12+
# xcode only signs the binaries after all build phases so we can't use the binary we built on this phase on Apple Silicon
13+
/usr/bin/codesign --force --sign - --timestamp\=none "${TARGET_BUILD_DIR}/ResourceConverter"
14+
1215
"${TARGET_BUILD_DIR}/ResourceConverter" \
1316
"${PROJECT_DIR}/Resources" \
1417
"${PROJECT_DIR}/WhateverGreen/kern_resources.cpp" \

WhateverGreen.xcodeproj/project.pbxproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,7 @@
727727
CE7FC0C220F6821600138088 /* Debug */ = {
728728
isa = XCBuildConfiguration;
729729
buildSettings = {
730+
ARCHS = "${ARCHS_STANDARD}";
730731
CLANG_ANALYZER_NONNULL = YES;
731732
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
732733
CLANG_CXX_LANGUAGE_STANDARD = "c++1y";
@@ -745,6 +746,7 @@
745746
CE7FC0C320F6821600138088 /* Release */ = {
746747
isa = XCBuildConfiguration;
747748
buildSettings = {
749+
ARCHS = "${ARCHS_STANDARD}";
748750
CLANG_ANALYZER_NONNULL = YES;
749751
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
750752
CLANG_CXX_LANGUAGE_STANDARD = "c++1y";
@@ -764,7 +766,7 @@
764766
isa = XCBuildConfiguration;
765767
buildSettings = {
766768
ALWAYS_SEARCH_USER_PATHS = NO;
767-
ARCHS = x86_64;
769+
ARCHS = "${ARCHS_STANDARD}";
768770
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
769771
CLANG_CXX_LANGUAGE_STANDARD = "c++1y";
770772
CLANG_CXX_LIBRARY = "libc++";

0 commit comments

Comments
 (0)