Windows / Scons OSL:
authorThomas Dinges <blender@dingto.org>
Thu, 15 Nov 2012 16:34:22 +0000 (16:34 +0000)
committerThomas Dinges <blender@dingto.org>
Thu, 15 Nov 2012 16:34:22 +0000 (16:34 +0000)
* Initial support, still commented.

build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-vc-config.py
intern/cycles/kernel/shaders/SConscript

index a2b76bbed888b6f9fcd580d0fc56e636921dd0d8..be30053c3143f465da7da5189f2611dfa1ecfdb8 100644 (file)
@@ -150,6 +150,19 @@ WITH_BF_OPENMP = True
 #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'
index a0c37f0b73f605c95da8087327a3fb4a965e12a3..8d49e178ddb1f81c39b2e17fa9f6fae75c3fcd5e 100644 (file)
@@ -146,6 +146,19 @@ WITH_BF_OPENMP = True
 #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'
index 8dfd5a304f32fcab044202bf436a9df42f3e2f24..924aff4fc225d834fcf956398d55d20c20c87444 100644 (file)
@@ -13,7 +13,7 @@ oso_files = []
 if env['WITH_BF_CYCLES_OSL']:
     shaders = env.Clone()
 
-    # cuda info
+    # osl compiler info
     osl_compiler = env['BF_OSL_COMPILER']
 
     # build directory