diff options
Diffstat (limited to 'project/FlowBuild.scala')
-rw-r--r-- | project/FlowBuild.scala | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala index e7a21d7..688743b 100644 --- a/project/FlowBuild.scala +++ b/project/FlowBuild.scala @@ -65,15 +65,15 @@ object FlowBuild extends Build { settings (commonSettings: _*) settings (publishSettings: _*) settings (JniDefaults.settings: _*) + settings(NativeDefaults.settings: _*) settings( - javahHeaderDirectory := (baseDirectory in ThisBuild).value / "flow-native" / "include", + nativeBuildDirectory := (baseDirectory in ThisBuild).value / "flow-native", + javahHeaderDirectory := nativeBuildDirectory.value / "src", javahClasses := Seq("com.github.jodersky.flow.internal.NativeSerial"), compileOrder in Compile := CompileOrder.Mixed, - libraryDependencies += Dependencies.akkaActor - ) - settings(NativeDefaults.settings: _*) - settings( - nativeBuildDirectory := (baseDirectory in ThisBuild).value / "flow-native" + libraryDependencies += Dependencies.akkaActor, + libraryDependencies += Dependencies.ioCore, + libraryDependencies += Dependencies.ioFile ) ) @@ -81,7 +81,9 @@ object FlowBuild extends Build { Project("flow-samples-terminal", file("flow-samples") / "flow-samples-terminal") settings(commonSettings: _*) settings(runSettings: _*) - //dependsOn(flowPack) + settings( + unmanagedJars in Compile += (nativePackage in flow).value + ) dependsOn(flow) ) |