From b7342a7847d18454b766ce6ce8012ffe85c47b5d Mon Sep 17 00:00:00 2001
From: shinra-electric <50119606+shinra-electric@users.noreply.github.com>
Date: Fri, 29 Dec 2023 23:02:22 +0000
Subject: [PATCH] [macOS] Add Architecture Priority to Info.plist (#3727)
* Add Architecture Priority to Info.plist
This allows the app bundle to be launched natively on Arm without the need for Rosetta.
* Remove arch shenanigans in soh-macos.sh.in
Shouldn't be necessary now...
* Add back launching the binary in soh-macos.sh.in
Accidentally removed launching the binary from the script.
---
soh/macosx/Info.plist.in | 5 +++++
soh/macosx/soh-macos.sh.in | 7 +------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/soh/macosx/Info.plist.in b/soh/macosx/Info.plist.in
index dd0a49e8f..61316a18f 100644
--- a/soh/macosx/Info.plist.in
+++ b/soh/macosx/Info.plist.in
@@ -33,5 +33,10 @@
public.app-category.games
LSMinimumSystemVersion
10.15
+ LSArchitecturePriority
+
+ arm64
+ x86_64
+
diff --git a/soh/macosx/soh-macos.sh.in b/soh/macosx/soh-macos.sh.in
index 0983f63b1..867d2395d 100755
--- a/soh/macosx/soh-macos.sh.in
+++ b/soh/macosx/soh-macos.sh.in
@@ -248,11 +248,6 @@ fi
cd "$SNAME"
-arch_name="$(uname -m)"
-launch_arch="arm64"
-if [ "${arch_name}" = "x86_64" ] && [ "$(sysctl -in sysctl.proc_translated)" != "1" ]; then
- launch_arch="x86_64"
-fi
+"$RESPATH"/soh-macos
-arch -${launch_arch} "$RESPATH"/soh-macos
exit