[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41737] trunk/blender/intern/cycles: Cycles: attempted fix for error building with sse/mtune optimization flags .
Brecht Van Lommel
brechtvanlommel at pandora.be
Thu Nov 10 15:13:34 CET 2011
Revision: 41737
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41737
Author: blendix
Date: 2011-11-10 14:13:32 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
Cycles: attempted fix for error building with sse/mtune optimization flags.
Modified Paths:
--------------
trunk/blender/intern/cycles/CMakeLists.txt
trunk/blender/intern/cycles/SConscript
Modified: trunk/blender/intern/cycles/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/CMakeLists.txt 2011-11-10 13:39:25 UTC (rev 41736)
+++ trunk/blender/intern/cycles/CMakeLists.txt 2011-11-10 14:13:32 UTC (rev 41737)
@@ -8,7 +8,9 @@
# Build Flags
-set(GCC_OPTIM_FLAGS "-ffast-math -msse -msse2 -msse3 -mtune=native")
+if(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+ set(GCC_OPTIM_FLAGS "-ffast-math -msse -msse2 -msse3")
+endif()
if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_OPTIM_FLAGS}")
Modified: trunk/blender/intern/cycles/SConscript
===================================================================
--- trunk/blender/intern/cycles/SConscript 2011-11-10 13:39:25 UTC (rev 41736)
+++ trunk/blender/intern/cycles/SConscript 2011-11-10 14:13:32 UTC (rev 41737)
@@ -24,10 +24,12 @@
defs.append('WITH_CUDA')
if env['OURPLATFORM'] in ('win32-mingw'):
- cxxflags.append('-fno-rtti -ffast-math -msse -msse2 -msse3 -mtune=native'.split())
- ccflags.append('-ffast-math -msse -msse2 -msse3 -mtune=native'.split())
+ cxxflags.append('-fno-rtti'.split())
+ if env['WITH_BF_RAYOPTIMIZATION']:
+ cxxflags.append('-ffast-math -msse -msse2 -msse3'.split())
+ ccflags.append('-ffast-math -msse -msse2 -msse3'.split())
defs.append('BOOST_NO_RTTI BOOST_NO_TYPEID'.split())
-
+
incs.extend('. bvh render device kernel kernel/osl kernel/svm util subd'.split())
incs.extend('#intern/guardedalloc #source/blender/makesrna #source/blender/makesdna'.split())
incs.extend('#source/blender/blenloader ../../source/blender/makesrna/intern'.split())
More information about the Bf-blender-cvs
mailing list