From 63e929925f740ba496f94bf6434a7930ce30d717 Mon Sep 17 00:00:00 2001 From: Joshua Portway Date: Fri, 11 Apr 2014 17:36:12 +0100 Subject: fixed build on OSX --- project/FlowBuild.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'project') 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, -- cgit v1.2.3