From b81d1b39537a24546a7610415f9721aba36115d5 Mon Sep 17 00:00:00 2001
From: glwnd <glwnd>
Date: Tue, 14 Jul 2026 15:33:19 +0200
Subject: [PATCH 1/2] arm64-no-rosetta

---
 Makefile                                                  | 5 ++++-
 build.gradle                                              | 2 +-
 ext/mac-bundle/Angry IP Scanner.app/Contents/Info.plist   | 7 +++++--
 ext/mac-bundle/Angry IP Scanner.app/Contents/MacOS/ipscan | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 777192e3d..1c775b3b8 100644
--- a/Makefile
+++ b/Makefile
@@ -27,4 +27,7 @@ win64:
 	
 mac:
 	./gradlew mac
-	
+
+macArm64:
+	./gradlew macArm64
+
diff --git a/build.gradle b/build.gradle
index 45a070385..df26e8bca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -304,7 +304,7 @@ def jlink(String target, String jrePath, String extraOpts = System.getenv("JLINK
     def jreDir = new File(target, jrePath)
     if (!jreDir.exists()) {
         jreDir.getParentFile().mkdirs()
-        exec("jlink --output $jrePath $extraOpts --vm=client --compress=2 --no-header-files --no-man-pages --strip-debug --add-modules " + javaModules.join(","), target)
+        exec("jlink --output $jrePath $extraOpts --compress=2 --no-header-files --no-man-pages --strip-debug --add-modules " + javaModules.join(","), target)
         ant.delete(dir: new File(jreDir, "legal"))
     }
 }
diff --git a/ext/mac-bundle/Angry IP Scanner.app/Contents/Info.plist b/ext/mac-bundle/Angry IP Scanner.app/Contents/Info.plist
index 1f0478af6..f86cafa2d 100644
--- a/ext/mac-bundle/Angry IP Scanner.app/Contents/Info.plist	
+++ b/ext/mac-bundle/Angry IP Scanner.app/Contents/Info.plist	
@@ -26,7 +26,10 @@
         <true/>
         <key>NSRequiresAquaSystemAppearance</key>
         <false/>
-        <key>LSRequiresNativeExecution</key>
-        <true/>
+        <key>LSArchitecturePriority</key>
+        <array>
+            <string>arm64</string>
+            <string>x86_64</string>
+        </array>
     </dict>
 </plist>
diff --git a/ext/mac-bundle/Angry IP Scanner.app/Contents/MacOS/ipscan b/ext/mac-bundle/Angry IP Scanner.app/Contents/MacOS/ipscan
index e00e2a45e..99aaab867 100755
--- a/ext/mac-bundle/Angry IP Scanner.app/Contents/MacOS/ipscan	
+++ b/ext/mac-bundle/Angry IP Scanner.app/Contents/MacOS/ipscan	
@@ -2,4 +2,4 @@
 BASEDIR=$(dirname "$0")
 java="$BASEDIR/jre/bin/java"
 if [ ! -e "$java" ]; then java=java; fi
-exec "$java" --add-opens java.base/java.net=ALL-UNNAMED --enable-native-access=ALL-UNNAMED -XstartOnFirstThread -jar "$BASEDIR"/ipscan*.jar
+exec "$java" --add-opens java.base/java.net=ALL-UNNAMED --enable-native-access=ALL-UNNAMED -XstartOnFirstThread -jar "$BASEDIR"/*.jar

From f7285f870d5edd0fd703e1d5e3a54d0a5f8355e4 Mon Sep 17 00:00:00 2001
From: glwnd <glwnd>
Date: Tue, 14 Jul 2026 15:52:17 +0200
Subject: [PATCH 2/2] macArm64 make target: pin JAVA_HOME to JDK 21 and list
 built zip

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1c775b3b8..1d3f90e0a 100644
--- a/Makefile
+++ b/Makefile
@@ -29,5 +29,6 @@ mac:
 	./gradlew mac
 
 macArm64:
-	./gradlew macArm64
+	JAVA_HOME=$$(/usr/libexec/java_home -v 21) ./gradlew macArm64
+	@ls -lh build/libs/*-macArm64.zip