diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-11-18 07:56:53 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-11-18 07:56:53 +0400 |
| commit | 681081306811c5a00269579c14277e2b747b77a3 (patch) | |
| tree | ab72c14558c0a9c0ad2116fc19127253ccf70fed /intern | |
| parent | 8cdc141b9a98decb993f09bce276c646d41c59ed (diff) | |
OSL / Windows:
* Some fixes for scons, kernel/osl compiles now.
* Still disabled per default, as relative path to oslc.exe does not work and linking fails.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/osl/SConscript | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/intern/cycles/kernel/osl/SConscript b/intern/cycles/kernel/osl/SConscript index 2060422ba13..59a6655eed6 100644 --- a/intern/cycles/kernel/osl/SConscript +++ b/intern/cycles/kernel/osl/SConscript @@ -17,6 +17,10 @@ defs.append('CCL_NAMESPACE_END=}') defs.append('WITH_OSL') 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)) |