diff options
Diffstat (limited to 'project')
| -rw-r--r-- | project/FlowBuild.scala | 10 | ||||
| -rw-r--r-- | project/native.scala | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala index 58e7ab3..8993f30 100644 --- a/project/FlowBuild.scala +++ b/project/FlowBuild.scala @@ -76,7 +76,7 @@ object FlowBuild extends Build { ) lazy val flowNative: Project = ( - Project("flow-native", file("flow-native-scala")) + Project("flow-native", file("flow-native-sbt")) settings(commonSettings: _*) settings(publishSettings: _*) settings(NativeDefaults.settings: _*) @@ -86,10 +86,16 @@ object FlowBuild extends Build { ) lazy val samplesTerminal = ( - Project("flow-samples-terminal", file("flow-samples") / "flow-samples-terminal") + Project("flow-samples-terminal", file("flow-samples") / "terminal") settings(commonSettings: _*) settings(runSettings: _*) dependsOn(flow) + + //kind of dirty, but it gets the sample to run without installing native libraries + settings( + (run in Compile) <<= (run in Compile).dependsOn(nativeBuild in flowNative), + javaOptions += "-Djava.library.path=" + (nativeOutputDirectory in flowNative).value.getAbsolutePath() + ) ) } diff --git a/project/native.scala b/project/native.scala index edd80c1..9af8b77 100644 --- a/project/native.scala +++ b/project/native.scala @@ -21,7 +21,7 @@ object NativeDefaults { val log = streams.value.log val build = nativeBuildDirectory.value - Process("make distclean", build) #|| Process("clean", build) ! log + Process("make distclean", build) #|| Process("make clean", build) ! log } val autoLib = Def.task { |