[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52320] trunk/blender: OSL / Windows:

Thomas Dinges blender at dingto.org
Sun Nov 18 04:57:01 CET 2012


Revision: 52320
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52320
Author:   dingto
Date:     2012-11-18 03:56:53 +0000 (Sun, 18 Nov 2012)
Log Message:
-----------
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. 

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/win32-vc-config.py
    trunk/blender/build_files/scons/config/win64-vc-config.py
    trunk/blender/intern/cycles/kernel/osl/SConscript

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py	2012-11-18 03:01:31 UTC (rev 52319)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py	2012-11-18 03:56:53 UTC (rev 52320)
@@ -151,8 +151,7 @@
 WITH_BF_CYCLES = True 
 
 #OSL
-'''
-WITH_BF_CYCLES_OSL = True
+WITH_BF_CYCLES_OSL = False
 WITH_BF_STATICOSL = True
 BF_OSL = LIBDIR + '/osl'
 BF_OSL_INC = '${BF_OSL}/include'
@@ -161,7 +160,6 @@
 BF_OSL_LIB = 'oslcomp oslexec oslquery'
 BF_OSL_LIBPATH = '${BF_OSL}/lib'
 BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
-'''
 
 WITH_BF_OIIO = True
 BF_OIIO = '${LIBDIR}/openimageio'

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py	2012-11-18 03:01:31 UTC (rev 52319)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py	2012-11-18 03:56:53 UTC (rev 52320)
@@ -147,8 +147,7 @@
 WITH_BF_CYCLES = True
 
 #OSL
-'''
-WITH_BF_CYCLES_OSL = True
+WITH_BF_CYCLES_OSL = False
 WITH_BF_STATICOSL = True
 BF_OSL = LIBDIR + '/osl'
 BF_OSL_INC = '${BF_OSL}/include'
@@ -157,7 +156,6 @@
 BF_OSL_LIB = 'oslcomp oslexec oslquery'
 BF_OSL_LIBPATH = '${BF_OSL}/lib'
 BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
-'''
 
 WITH_BF_OIIO = True
 BF_OIIO = '${LIBDIR}/openimageio'

Modified: trunk/blender/intern/cycles/kernel/osl/SConscript
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/SConscript	2012-11-18 03:01:31 UTC (rev 52319)
+++ trunk/blender/intern/cycles/kernel/osl/SConscript	2012-11-18 03:56:53 UTC (rev 52320)
@@ -17,6 +17,10 @@
 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))




More information about the Bf-blender-cvs mailing list