Use sbt-jni plugin

2 files changed, 13 insertions, 1 deletions

diff --git a/flow-main/build.sbt b/flow-main/build.sbt
new file mode 100644
index 0000000..a852935
--- /dev/null
+++ b/flow-main/build.sbt
@@ -0,0 +1,10 @@
+enablePlugins(JniJvm)
+
+//there are also java sources in this project
+compileOrder in Compile := CompileOrder.Mixed
+
+libraryDependencies += "com.typesafe.akka" %% "akka-actor" % "2.4.1"
+
+target in (Compile, javah) := (baseDirectory in ThisBuild).value / "flow-native" / "src" / "src"
+
+name := "flow"
diff --git a/flow-main/src/main/java/com/github/jodersky/flow/internal/NativeSerial.java b/flow-main/src/main/java/com/github/jodersky/flow/internal/NativeSerial.java
index c159058..6fac8da 100644
--- a/flow-main/src/main/java/com/github/jodersky/flow/internal/NativeSerial.java
+++ b/flow-main/src/main/java/com/github/jodersky/flow/internal/NativeSerial.java
@@ -3,6 +3,8 @@ package com.github.jodersky.flow.internal;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
+import ch.jodersky.jni.NativeLoader;
+
 import com.github.jodersky.flow.AccessDeniedException;
 import com.github.jodersky.flow.InvalidSettingsException;
 import com.github.jodersky.flow.NoSuchPortException;
@@ -25,7 +27,7 @@ import com.github.jodersky.flow.PortInterruptedException;
 final class NativeSerial {
 	
 	static {
-		NativeLoader.load("flow3");
+		NativeLoader.load("/com/github/jodersky/flow", "flow3");
 	}
 	
 	final static int PARITY_NONE = 0;