add windows aarch64 support

runelite · Jun 24, 2023 · 624b2ce · 624b2ce
1 parent b02e99e
commit 624b2ce
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 0 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,12 +16,15 @@ jobs:
         cmake --build build --config Release
         cmake -A Win32 -G "Visual Studio 17 2022" -B build32 .
         cmake --build build32 --config Release
+        cmake -A ARM64 -G "Visual Studio 17 2022" -B build-arm64 .
+        cmake --build build-arm64 --config Release
     - uses: actions/upload-artifact@v3
       with:
         name: windows
         path: |
           src\main\native\packr\build\src\Release\packr.exe
           src\main\native\packr\build32\src\Release\packr.exe
+          src\main\native\packr\build-arm64\src\Release\packr.exe
         if-no-files-found: error
   macos:
     runs-on: macos-11
@@ -54,6 +57,7 @@ jobs:
     - uses: actions/download-artifact@v3
       with:
         path: artifacts
+    - run: sudo apt update
     - run: sudo apt install -y gcc-9-aarch64-linux-gnu g++-9-aarch64-linux-gnu
     - name: build natives
       run: |
@@ -68,6 +72,7 @@ jobs:
         set -e
         cp artifacts/windows/build/src/Release/packr.exe src/main/resources/packr-windows-x64.exe
         cp artifacts/windows/build32/src/Release/packr.exe src/main/resources/packr-windows.exe
+        cp artifacts/windows/build-arm64/src/Release/packr.exe src/main/resources/packr-windows-arm64.exe
         cp artifacts/macos/build/src/packr src/main/resources/packr-mac-x64
         cp artifacts/macos/build-arm64/src/packr src/main/resources/packr-mac-arm64
         cp src/main/native/packr/build/src/packr src/main/resources/packr-linux-x64

diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,8 @@
 .project
 .classpath
 .settings
+src/main/native/packr/build*
+src/main/resources/packr*
 native/build
 native/obj
 native/packr.xcodeproj/

diff --git a/src/main/java/com/badlogicgames/packr/Packr.java b/src/main/java/com/badlogicgames/packr/Packr.java
@@ -140,6 +140,10 @@ private void copyExecutableAndClasspath(PackrOutput output) throws IOException {
 				exe = readResource("/packr-windows-x64.exe");
 				extension = ".exe";
 				break;
+			case WindowsAarch64:
+				exe = readResource("/packr-windows-arm64.exe");
+				extension = ".exe";
+				break;
 			case Linux64:
 				exe = readResource("/packr-linux-x64");
 				break;

diff --git a/src/main/java/com/badlogicgames/packr/PackrConfig.java b/src/main/java/com/badlogicgames/packr/PackrConfig.java
@@ -39,6 +39,7 @@ public class PackrConfig {
 	public enum Platform {
 		Windows32("windows32"),
 		Windows64("windows64"),
+		WindowsAarch64("windowsaarch64"),
 		Linux64("linux64"),
 		LinuxAarch64("linuxaarch64"),
 		MacOS64("mac64"),

diff --git a/src/main/java/com/badlogicgames/packr/PackrReduce.java b/src/main/java/com/badlogicgames/packr/PackrReduce.java
@@ -206,6 +206,7 @@ static void removePlatformLibs(PackrOutput output,
 		switch (config.platform) {
 			case Windows32:
 			case Windows64:
+			case WindowsAarch64:
 				extensions.add(".dylib");
 				extensions.add(".dylib.git");
 				extensions.add(".dylib.sha1");