diff options
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/osl/SConscript | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/intern/cycles/kernel/osl/SConscript b/intern/cycles/kernel/osl/SConscript index 59a6655eed6..d4b42d2becb 100644 --- a/intern/cycles/kernel/osl/SConscript +++ b/intern/cycles/kernel/osl/SConscript @@ -3,24 +3,25 @@ Import('env') defs = [] -sources = env.Glob('*.cpp') +incs = [] +cxxflags = Split(env['CXXFLAGS']) -incs = '. .. ../svm ../../render ../../util ../../device' +sources = env.Glob('*.cpp') -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) |