Skip to content

Add support for Windows ARM64 #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ctrueden merged 1 commit into from
Aug 10, 2021
Merged

Add support for Windows ARM64 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/org/scijava/nativelib/NativeLibraryUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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:
Expand Down