From 75d71370258b102144a1f5941b64f35ddf815a8c Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Thu, 30 Apr 2015 21:50:05 -0700 Subject: added a class I found to load JNI code from within JAR files on non-android platforms. That doesn't come for free, unlike android. --- java/src/com/zerotierone/sdk/Node.java | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'java/src/com/zerotierone/sdk/Node.java') diff --git a/java/src/com/zerotierone/sdk/Node.java b/java/src/com/zerotierone/sdk/Node.java index 911e83d3..6b4a8729 100644 --- a/java/src/com/zerotierone/sdk/Node.java +++ b/java/src/com/zerotierone/sdk/Node.java @@ -31,13 +31,31 @@ import java.nio.ByteBuffer; import java.lang.Long; import java.net.InetSocketAddress; import java.util.ArrayList; +import java.io.IOException; /** * A ZeroTier One node */ public class Node { static { - System.loadLibrary("ZeroTierOneJNI"); + try { + System.loadLibrary("ZeroTierOneJNI"); + } catch (UnsatisfiedLinkError e) { + try { + if(System.getProperty("os.name").startsWith("Windows")) { + System.out.println("Arch: " + System.getProperty("sun.arch.data.model")); + if(System.getProperty("sun.arch.data.model").equals("64")) { + NativeUtils.loadLibraryFromJar("/lib/ZeroTierOneJNI_win64.dll"); + } else { + NativeUtils.loadLibraryFromJar("/lib/ZeroTierOneJNI_win32.dll"); + } + } else { + // TODO: Mac + } + } catch (IOException ioe) { + ioe.printStackTrace(); + } + } } private static final String TAG = "NODE"; -- cgit v1.2.3