[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56386] trunk/blender/intern/cycles/kernel /osl/SConscript: Cycles / SCons:

Thomas Dinges blender at dingto.org
Mon Apr 29 17:52:38 CEST 2013


Revision: 56386
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56386
Author:   dingto
Date:     2013-04-29 15:52:38 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
Cycles / SCons:
* Fast math compiler flag was set for Cycles, but not OSL. 

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

Modified: trunk/blender/intern/cycles/kernel/osl/SConscript
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/SConscript	2013-04-29 15:50:12 UTC (rev 56385)
+++ trunk/blender/intern/cycles/kernel/osl/SConscript	2013-04-29 15:52:38 UTC (rev 56386)
@@ -44,10 +44,10 @@
 defs.append('WITH_OSL')
 
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-    cxxflags.append('-DBOOST_NO_RTTI -DBOOST_NO_TYPEID'.split())
+    cxxflags.append('-DBOOST_NO_RTTI -DBOOST_NO_TYPEID /fp:fast'.split())
     incs.append(env['BF_PTHREADS_INC'])
     defs.append('OSL_STATIC_LIBRARY')
 else:
-    cxxflags.append('-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID'.split())
+    cxxflags.append('-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID -ffast-math'.split())
 
 env.BlenderLib ('cycles_kernel_osl', sources, incs, defs, libtype=['intern'], priority=[10], cxx_compileflags=cxxflags)




More information about the Bf-blender-cvs mailing list