OSX/scons/osl: ready for compile now, little hack to be resolved, todo:fix a crash with shadercompile

2012-11-16 00:43:28 +00:00
parent b3f6c12136
commit 4ece50723b
2 changed files with 12 additions and 1 deletions
--- a/intern/cycles/kernel/shaders/SConscript
+++ b/intern/cycles/kernel/shaders/SConscript
@@ -14,7 +14,10 @@ if env['WITH_BF_CYCLES_OSL']:
    shaders = env.Clone()

    # osl compiler info
-    osl_compiler = env['BF_OSL_COMPILER']
+    if env['OURPLATFORM']=='darwin':
+        osl_compiler = '../lib/darwin-9.x.universal/osl/bin/oslc' # temporary hack to get the leading "#" away that breaks shadercompile
+    else:
+        osl_compiler = env['BF_OSL_COMPILER']

    # build directory
    root_build_dir = normpath(env['BF_BUILDDIR'])