Merge pull request #124 from AberrantWolf/master

Fixed OSX App generation via new premake5 and default OIIO paths
GPUOpen-LibrariesAndSDKs · Jan 25, 2017 · 62e7d63 · 62e7d63
2 parents 9a8223c + dd250cd
commit 62e7d63
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/App/App.lua b/App/App.lua
@@ -7,8 +7,8 @@ project "App"
     includedirs{ "../RadeonRays/include", "../CLW", "." }
 
     if os.is("macosx") then
-        includedirs {"../3rdparty/oiio16/include"}
-        libdirs {"../3rdparty/oiio16/lib/x64", "/usr/local/lib"}
+        sysincludedirs {"/usr/local/include"}
+        libdirs {"/usr/local/lib"}
         linkoptions{ "-framework OpenGL", "-framework GLUT" }
         buildoptions "-std=c++11 -stdlib=libc++"
         links {"OpenImageIO"}

diff --git a/Tools/premake/osx/premake5 b/Tools/premake/osx/premake5