From d129706d788a50d6dacd5511ed315e65ce508529 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Thu, 5 Aug 2021 22:00:19 -0400 Subject: [PATCH] Add support for Windows ARM64 --- README.md | 2 ++ .../java/org/scijava/nativelib/NativeLibraryUtil.java | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2874bf8..d57068b 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,8 @@ following directory & file structure: xxx[-vvv].dll /windows_64 xxx[-vvv].dll + /windows_arm64 + xxx[-vvv].dll /aix_32 libxxx[-vvv].so libxxx[-vvv].a diff --git a/src/main/java/org/scijava/nativelib/NativeLibraryUtil.java b/src/main/java/org/scijava/nativelib/NativeLibraryUtil.java index 1ea8404..ecb5468 100644 --- a/src/main/java/org/scijava/nativelib/NativeLibraryUtil.java +++ b/src/main/java/org/scijava/nativelib/NativeLibraryUtil.java @@ -83,8 +83,8 @@ public class NativeLibraryUtil { public static enum Architecture { - UNKNOWN, LINUX_32, LINUX_64, LINUX_ARM, LINUX_ARM64, WINDOWS_32, WINDOWS_64, OSX_32, - OSX_64, OSX_PPC, OSX_ARM64, AIX_32, AIX_64 + UNKNOWN, LINUX_32, LINUX_64, LINUX_ARM, LINUX_ARM64, WINDOWS_32, WINDOWS_64, WINDOWS_ARM64, + OSX_32, OSX_64, OSX_PPC, OSX_ARM64, AIX_32, AIX_64 } private static enum Processor { @@ -138,6 +138,9 @@ else if (name.contains("win")) { else if (Processor.INTEL_64 == processor) { architecture = Architecture.WINDOWS_64; } + else if (Processor.AARCH_64 == processor) { + architecture = Architecture.WINDOWS_ARM64; + } } else if (name.contains("mac")) { if (Processor.INTEL_32 == processor) { @@ -236,6 +239,7 @@ public static String getPlatformLibraryName(final String libName) { break; case WINDOWS_32: case WINDOWS_64: + case WINDOWS_ARM64: name = libName + ".dll"; break; case OSX_32: