[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52354] trunk/blender/intern/cycles/kernel /shaders/SConscript: OSX/scons: refine oslc compile workaround

jens verwiebe info at jensverwiebe.de
Mon Nov 19 12:46:56 CET 2012


Revision: 52354
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52354
Author:   jensverwiebe
Date:     2012-11-19 11:46:55 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
OSX/scons: refine oslc compile workaround

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/shaders/SConscript

Modified: trunk/blender/intern/cycles/kernel/shaders/SConscript
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/SConscript	2012-11-19 11:45:25 UTC (rev 52353)
+++ trunk/blender/intern/cycles/kernel/shaders/SConscript	2012-11-19 11:46:55 UTC (rev 52354)
@@ -15,7 +15,7 @@
 
     # osl compiler info
     if env['OURPLATFORM']=='darwin':
-        osl_compiler = '../lib/darwin-9.x.universal/osl/bin/oslc' # temporary hack to get the leading "#" away that breaks shadercompile
+        osl_compiler = env['LCGDIR'][1:] + '/osl/bin/oslc' # get the leading "#" away that breaks shadercompile
     else:
         osl_compiler = env['BF_OSL_COMPILER']
 




More information about the Bf-blender-cvs mailing list