[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52333] trunk/blender/intern/cycles/kernel /osl/SConscript: Windows / OSL:

[Thomas Dinges]

Revision: 52333
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52333
Author:   dingto
Date:     2012-11-18 15:02:09 +0000 (Sun, 18 Nov 2012)
Log Message:
-----------
Windows / OSL:
* Scons cleanup, to avoid redeclaration of /EHsc. Linking still fails. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/osl/SConscript

Modified: trunk/blender/intern/cycles/kernel/osl/SConscript
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/SConscript	2012-11-18 14:27:19 UTC (rev 52332)
+++ trunk/blender/intern/cycles/kernel/osl/SConscript	2012-11-18 15:02:09 UTC (rev 52333)
@@ -3,24 +3,25 @@
 Import('env')
 
 defs = []
+incs = []
+cxxflags = Split(env['CXXFLAGS'])
+
 sources = env.Glob('*.cpp')
 
-incs = '. .. ../svm ../../render ../../util ../../device'
+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())
 
-incs += ' ' + env['BF_OIIO_INC']
-incs += ' ' + env['BF_BOOST_INC']
-incs += ' ' + env['BF_OSL_INC']
-incs += ' ' + env['BF_OPENEXR_INC']
-
 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)