[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52237] trunk/blender: Windows / Scons OSL :

[Thomas Dinges]

Revision: 52237
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52237
Author:   dingto
Date:     2012-11-15 16:34:22 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
Windows / Scons OSL:
* Initial support, still commented. 

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/win32-vc-config.py
    trunk/blender/build_files/scons/config/win64-vc-config.py
    trunk/blender/intern/cycles/kernel/shaders/SConscript

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py	2012-11-15 16:05:15 UTC (rev 52236)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py	2012-11-15 16:34:22 UTC (rev 52237)
@@ -150,6 +150,19 @@
 #Cycles
 WITH_BF_CYCLES = True 
 
+#OSL
+'''
+WITH_BF_CYCLES_OSL = True
+WITH_BF_STATICOSL = True
+BF_OSL = LIBDIR + '/osl'
+BF_OSL_INC = '${BF_OSL}/include'
+# note oslexec would passed via program linkflags, which is needed to
+# make llvm happy with osl_allocate_closure_component
+BF_OSL_LIB = 'oslcomp oslexec oslquery'
+BF_OSL_LIBPATH = '${BF_OSL}/lib'
+BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
+'''
+
 WITH_BF_OIIO = True
 BF_OIIO = '${LIBDIR}/openimageio'
 BF_OIIO_INC = '${BF_OIIO}/include'

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py	2012-11-15 16:05:15 UTC (rev 52236)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py	2012-11-15 16:34:22 UTC (rev 52237)
@@ -146,6 +146,19 @@
 #Cycles
 WITH_BF_CYCLES = True
 
+#OSL
+'''
+WITH_BF_CYCLES_OSL = True
+WITH_BF_STATICOSL = True
+BF_OSL = LIBDIR + '/osl'
+BF_OSL_INC = '${BF_OSL}/include'
+# note oslexec would passed via program linkflags, which is needed to
+# make llvm happy with osl_allocate_closure_component
+BF_OSL_LIB = 'oslcomp oslexec oslquery'
+BF_OSL_LIBPATH = '${BF_OSL}/lib'
+BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
+'''
+
 WITH_BF_OIIO = True
 BF_OIIO = '${LIBDIR}/openimageio'
 BF_OIIO_INC = '${BF_OIIO}/include'

Modified: trunk/blender/intern/cycles/kernel/shaders/SConscript
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/SConscript	2012-11-15 16:05:15 UTC (rev 52236)
+++ trunk/blender/intern/cycles/kernel/shaders/SConscript	2012-11-15 16:34:22 UTC (rev 52237)
@@ -13,7 +13,7 @@
 if env['WITH_BF_CYCLES_OSL']:
     shaders = env.Clone()
 
-    # cuda info
+    # osl compiler info
     osl_compiler = env['BF_OSL_COMPILER']
 
     # build directory