aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Portway <josh@stain.org>2014-04-12 01:01:26 +0100
committerJoshua Portway <josh@stain.org>2014-04-12 01:01:26 +0100
commitcd255efe5c29efc013b4aa544033da56b0e36115 (patch)
tree19e74e7131d1f69bfbb23aebff25615bbbd69e11
parent63e929925f740ba496f94bf6434a7930ce30d717 (diff)
downloadakka-serial-cd255efe5c29efc013b4aa544033da56b0e36115.tar.gz
akka-serial-cd255efe5c29efc013b4aa544033da56b0e36115.tar.bz2
akka-serial-cd255efe5c29efc013b4aa544033da56b0e36115.zip
updated name of osx uni library, and added it to list of native libraries to copy
-rw-r--r--project/FlowBuild.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala
index 1f96d3e..af381d0 100644
--- a/project/FlowBuild.scala
+++ b/project/FlowBuild.scala
@@ -114,7 +114,7 @@ object FlowBuild extends Build {
val linker = compiler
val cFlags = Seq("-O2", "-fPIC")
val linkerFlags = Seq("-dynamiclib")
- val binary = s"libflow.jnilib"
+ val binary = s"libflow.dylib"
val localBuild = NativeBuild(
"amd64-macosx",
@@ -156,7 +156,8 @@ object FlowBuild extends Build {
val linkMappings = Map(
"x86_64-linux-gnu" -> "amd64-linux",
"x86-linux-gnu" -> "x86-linux",
- "arm-linux-gnueabihf" -> "arm-linux"
+ "arm-linux-gnueabihf" -> "arm-linux",
+ "amd64-macosx" -> "x86_64-macosx"
)
val ls: Seq[(NativeBuild, File)] = (nativeLink in flow).value.toSeq
for ((build, binary) <- ls; n <- linkMappings.get(build.name)) yield {