[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52263] trunk/blender: OSX/scons/osl: ready for compile now, little hack to be resolved, todo: fix a crash with shadercompile

[jens verwiebe]

Revision: 52263
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52263
Author:   jensverwiebe
Date:     2012-11-16 00:43:28 +0000 (Fri, 16 Nov 2012)
Log Message:
-----------
OSX/scons/osl: ready for compile now, little hack to be resolved, todo:fix a crash with shadercompile

Modified Paths:
--------------
    trunk/blender/build_files/scons/tools/Blender.py
    trunk/blender/intern/cycles/kernel/shaders/SConscript

Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py	2012-11-15 23:21:21 UTC (rev 52262)
+++ trunk/blender/build_files/scons/tools/Blender.py	2012-11-16 00:43:28 UTC (rev 52263)
@@ -652,6 +652,14 @@
             cmd = 'cp -R %s/../intern/cycles/kernel/*.cubin %s/lib/' % (builddir, cinstalldir)
             commands.getoutput(cmd)
 
+            if env['WITH_BF_CYCLES_OSL']:
+                cmd = 'mkdir %s/shader' % (cinstalldir)
+                commands.getoutput(cmd)
+                cmd = 'cp -R %s/kernel/shaders/*.h %s/shader' % (croot, cinstalldir)
+                commands.getoutput(cmd)
+                cmd = 'cp -R %s/../intern/cycles/kernel/shaders/*.oso %s/shader' % (builddir, cinstalldir)
+                commands.getoutput(cmd)
+
     if env['WITH_OSX_STATICPYTHON']:
         cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION)
         commands.getoutput(cmd)

Modified: trunk/blender/intern/cycles/kernel/shaders/SConscript
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/SConscript	2012-11-15 23:21:21 UTC (rev 52262)
+++ trunk/blender/intern/cycles/kernel/shaders/SConscript	2012-11-16 00:43:28 UTC (rev 52263)
@@ -14,7 +14,10 @@
     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'])