diff options
| author | Joshua Portway <josh@stain.org> | 2014-04-11 17:36:12 +0100 |
|---|---|---|
| committer | Joshua Portway <josh@stain.org> | 2014-04-11 17:36:12 +0100 |
| commit | 63e929925f740ba496f94bf6434a7930ce30d717 (patch) | |
| tree | 0f952ff607935344a2cd04169f89194afde86d3b | |
| parent | f64408573bd408c7831999566dbb614a607aab41 (diff) | |
| download | akka-serial-63e929925f740ba496f94bf6434a7930ce30d717.tar.gz akka-serial-63e929925f740ba496f94bf6434a7930ce30d717.tar.bz2 akka-serial-63e929925f740ba496f94bf6434a7930ce30d717.zip | |
fixed build on OSX
| -rw-r--r-- | project/FlowBuild.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/project/FlowBuild.scala b/project/FlowBuild.scala index fc1997e..1f96d3e 100644 --- a/project/FlowBuild.scala +++ b/project/FlowBuild.scala @@ -127,8 +127,7 @@ object FlowBuild extends Build { lazy val settings = Seq( nativeVersion := NativeVersionPosix, - nativeIncludeDirectories += file("/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"), - nativeIncludeDirectories += file("/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers"), + nativeIncludeDirectories ++= jdkHome.value.map(jdk => jdk / "include" / "darwin").toSeq, nativeSource := nativeSource.value / "posix", nativeBuilds := Seq(localBuild) ) @@ -139,6 +138,7 @@ object FlowBuild extends Build { def selectHost() = System.getProperty("os.name").toLowerCase match { case "linux" => Linux case "macosx" => MacOSX + case "mac os x" => MacOSX case _ => new Host{ val settings = Seq( nativeCompile := osError, |