diff options
author | Sabine Odersky <sabineodersky@Sabine-Oderskys-MacBook-Pro.local> | 2013-07-04 21:26:29 +0200 |
---|---|---|
committer | Sabine Odersky <sabineodersky@Sabine-Oderskys-MacBook-Pro.local> | 2013-07-04 21:26:29 +0200 |
commit | b03820da96770f7cc6478c746601252ce1984ce6 (patch) | |
tree | da220ee8132e55483f0b316d06901c7d5609f6cf /project | |
parent | 38e680d523d392034e881da015da03b64036c580 (diff) | |
download | akka-serial-b03820da96770f7cc6478c746601252ce1984ce6.tar.gz akka-serial-b03820da96770f7cc6478c746601252ce1984ce6.tar.bz2 akka-serial-b03820da96770f7cc6478c746601252ce1984ce6.zip |
linking works, testing needed
Diffstat (limited to 'project')
-rw-r--r-- | project/Build.scala | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/project/Build.scala b/project/Build.scala index d743ddd..3af906a 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -109,15 +109,16 @@ object FlowBuild extends Build { val UnixBinaryMinorVersion = 0 lazy val unixNativeSettings: Seq[Setting[_]] = commonNativeSettings ++ Seq( - flags in Native := Seq("-fPIC", "-O2"), - linkFlags in Native ++= Seq("-shared", s"-Wl,-soname,libflow.so.${BinaryMajorVersion}"), - binaryName in Native := s"libflow.so.${BinaryMajorVersion}.${UnixBinaryMinorVersion}") + flags in Native := Seq("-fPIC", "-O2") + ) lazy val nativeLinux = ( NativeProject("flow-native-linux", file("flow-native") / "unix") settings (unixNativeSettings: _*) settings ( - includeDirectories in Native += jdkHome.value / "include" / "linux" + includeDirectories in Native += jdkHome.value / "include" / "linux", +linkFlags in Native ++= Seq("-shared", s"-Wl,-soname,libflow.so.${BinaryMajorVersion}"), + binaryName in Native := s"libflow.so.${BinaryMajorVersion}.${UnixBinaryMinorVersion}" ) dependsOn(main) ) @@ -127,7 +128,9 @@ object FlowBuild extends Build { settings (unixNativeSettings: _*) settings ( includeDirectories in Native += file("/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"), - includeDirectories in Native += file("/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers") + includeDirectories in Native += file("/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers"), +linkFlags in Native ++= Seq("-dynamiclib"), + binaryName in Native := s"libflow.jnilib.${BinaryMajorVersion}.${UnixBinaryMinorVersion}" ) dependsOn (main) ) |