bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

OSL / Windows:

Browse Source 
* Some fixes for scons, kernel/osl compiles now. 
* Still disabled per default, as relative path to oslc.exe does not work and linking fails.
This commit is contained in:
Thomas Dinges 2012-11-18 03:56:53 +00:00
parent 8cdc141b9a
commit 6810813068
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_files/scons/config/win32-vc-config.py
View File

@ -151,8 +151,7 @@ WITH_BF_OPENMP = True
WITH_BF_CYCLES = True WITH_BF_CYCLES = True
#OSL #OSL
''' WITH_BF_CYCLES_OSL = False
WITH_BF_CYCLES_OSL = True
WITH_BF_STATICOSL = True WITH_BF_STATICOSL = True
BF_OSL = LIBDIR + '/osl' BF_OSL = LIBDIR + '/osl'
BF_OSL_INC = '${BF_OSL}/include' BF_OSL_INC = '${BF_OSL}/include'
@ -161,7 +160,6 @@ BF_OSL_INC = '${BF_OSL}/include'
BF_OSL_LIB = 'oslcomp oslexec oslquery' BF_OSL_LIB = 'oslcomp oslexec oslquery'
BF_OSL_LIBPATH = '${BF_OSL}/lib' BF_OSL_LIBPATH = '${BF_OSL}/lib'
BF_OSL_COMPILER = '${BF_OSL}/bin/oslc' BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
'''
WITH_BF_OIIO = True WITH_BF_OIIO = True
BF_OIIO = '${LIBDIR}/openimageio' BF_OIIO = '${LIBDIR}/openimageio'

4
build_files/scons/config/win64-vc-config.py
View File

@ -147,8 +147,7 @@ WITH_BF_OPENMP = True
WITH_BF_CYCLES = True WITH_BF_CYCLES = True
#OSL #OSL
''' WITH_BF_CYCLES_OSL = False
WITH_BF_CYCLES_OSL = True
WITH_BF_STATICOSL = True WITH_BF_STATICOSL = True
BF_OSL = LIBDIR + '/osl' BF_OSL = LIBDIR + '/osl'
BF_OSL_INC = '${BF_OSL}/include' BF_OSL_INC = '${BF_OSL}/include'
@ -157,7 +156,6 @@ BF_OSL_INC = '${BF_OSL}/include'
BF_OSL_LIB = 'oslcomp oslexec oslquery' BF_OSL_LIB = 'oslcomp oslexec oslquery'
BF_OSL_LIBPATH = '${BF_OSL}/lib' BF_OSL_LIBPATH = '${BF_OSL}/lib'
BF_OSL_COMPILER = '${BF_OSL}/bin/oslc' BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
'''
WITH_BF_OIIO = True WITH_BF_OIIO = True
BF_OIIO = '${LIBDIR}/openimageio' BF_OIIO = '${LIBDIR}/openimageio'

6
intern/cycles/kernel/osl/SConscript
View File

@ -17,6 +17,10 @@ defs.append('CCL_NAMESPACE_END=}')
defs.append('WITH_OSL') defs.append('WITH_OSL')
cxxflags = env['CXXFLAGS'] cxxflags = env['CXXFLAGS']
cxxflags = "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID" if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
cxxflags = "/EHsc -DBOOST_NO_RTTI -DBOOST_NO_TYPEID"
incs += ' ' + env['BF_PTHREADS_INC']
else:
cxxflags = "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID"
env.BlenderLib ('cycles_kernel_osl', sources, Split(incs), defs, libtype=['intern'], priority=[10], cxx_compileflags=Split(cxxflags)) env.BlenderLib ('cycles_kernel_osl', sources, Split(incs), defs, libtype=['intern'], priority=[10], cxx_compileflags=Split(cxxflags))