Revision: 46644
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46644
Author: psy-fi
Date: 2012-05-14 23:36:07 +0000 (Mon, 14 May 2012)
Log Message:
-----------
Cleanup optimization compile flags for mingw-w64.
After testing it seems that for safe debug sessions, debug build optimizations
need to be off.
Also removed sse flags from release flags since they are included in ray
optimization flags which are on by default.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/scons/config/win64-mingw-config.py
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-05-14 21:32:35 UTC (rev 46643)
+++ trunk/blender/CMakeLists.txt 2012-05-14 23:36:07 UTC (rev 46644)
@@ -1011,8 +1011,10 @@
set(PLATFORM_CFLAGS "-pipe -funsigned-char
-fno-strict-aliasing")
if(WITH_MINGW64)
- #Yes, the point for MinGW64 is moar optimization by
default :)
- set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -msse
-msse2 -ftree-vectorize")
+ #We need to take care though not to have these on debug
builds because they may play funky with gdb
+ if(CMAKE_BUILD_TYPE MATCHES "Release")
+ set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx
-ftree-vectorize")
+ endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
Modified: trunk/blender/build_files/scons/config/win64-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-mingw-config.py
2012-05-14 21:32:35 UTC (rev 46643)
+++ trunk/blender/build_files/scons/config/win64-mingw-config.py
2012-05-14 23:36:07 UTC (rev 46644)
@@ -167,7 +167,7 @@
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2', '-ftree-vectorize']
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2']
#Produces errors while rendering with subsurf/multires,
WITH_BF_OPENMP = False
@@ -182,7 +182,7 @@
CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64',
'-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE',
'-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC']
REL_CFLAGS = []
REL_CXXFLAGS = []
-REL_CCFLAGS = ['-DNDEBUG', '-O2', '-mmmx', '-msse', '-msse2',
'-ftree-vectorize']
+REL_CCFLAGS = ['-DNDEBUG', '-O2', '-ftree-vectorize']
C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement',
'-Wstrict-prototypes']
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
