sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Windows / Scons OSL:

Browse Source 
* Initial support, still commented.
This commit is contained in:
Thomas Dinges 2012-11-15 16:34:22 +00:00
parent 5c6f6301b0
commit 1c9b548d92
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build_files/scons/config/win32-vc-config.py
View 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'

13
build_files/scons/config/win64-vc-config.py
View 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'

2
intern/cycles/kernel/shaders/SConscript
View 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