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

Windows / OSL:

Browse Source 
* Scons cleanup, to avoid redeclaration of /EHsc. Linking still fails.
This commit is contained in:
Thomas Dinges 2012-11-18 15:02:09 +00:00
parent 03f4e7fba4
commit 70b6e2717a
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,24 +3,25 @@
Import('env')
defs = []
incs = []
cxxflags = Split(env['CXXFLAGS'])
sources = env.Glob('*.cpp')
incs = '. .. ../svm ../../render ../../util ../../device'
incs += ' ' + env['BF_OIIO_INC']
incs += ' ' + env['BF_BOOST_INC']
incs += ' ' + env['BF_OSL_INC']
incs += ' ' + env['BF_OPENEXR_INC']
incs.extend('. .. ../svm ../../render ../../util ../../device'.split())
incs.append(env['BF_OIIO_INC'])
incs.append(env['BF_BOOST_INC'])
incs.append(env['BF_OSL_INC'])
incs.append(env['BF_OPENEXR_INC'].split())
defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {')
defs.append('CCL_NAMESPACE_END=}')
defs.append('WITH_OSL')
cxxflags = env['CXXFLAGS']
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
cxxflags = "/EHsc -DBOOST_NO_RTTI -DBOOST_NO_TYPEID"
incs += ' ' + env['BF_PTHREADS_INC']
cxxflags.append('-DBOOST_NO_RTTI -DBOOST_NO_TYPEID'.split())
incs.append(env['BF_PTHREADS_INC'])
else:
cxxflags = "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID"
cxxflags.append('-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID'.split())
env.BlenderLib ('cycles_kernel_osl', sources, Split(incs), defs, libtype=['intern'], priority=[10], cxx_compileflags=Split(cxxflags))
env.BlenderLib ('cycles_kernel_osl', sources, incs, defs, libtype=['intern'], priority=[10], cxx_compileflags=cxxflags)