diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2012-05-15 03:36:07 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2012-05-15 03:36:07 +0400 |
commit | 232980eef01a0a6d5ef5b80ad9f9dfbc6ec584a0 (patch) | |
tree | 8d06e63f92a377337dc8fe19d093b36181aafe98 | |
parent | 8f2c8480751ed9c1abaa56dc7b3b941605d42f76 (diff) |
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.
-rw-r--r-- | CMakeLists.txt | 6 | ||||
-rw-r--r-- | build_files/scons/config/win64-mingw-config.py | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d39dfd9e999..6b34c36d90d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1011,8 +1011,10 @@ elseif(WIN32) 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") diff --git a/build_files/scons/config/win64-mingw-config.py b/build_files/scons/config/win64-mingw-config.py index 37e4bcd77a8..cecf91e48a8 100644 --- a/build_files/scons/config/win64-mingw-config.py +++ b/build_files/scons/config/win64-mingw-config.py @@ -167,7 +167,7 @@ BF_BOOST_LIBPATH = BF_BOOST + '/lib' #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 @@ CXXFLAGS = [ '-fpermissive' ] 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'] |