diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-10 18:13:32 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-10 18:13:32 +0400 |
| commit | cf6a1320a8ba5e8952766ad97da6c6a5aaa5472e (patch) | |
| tree | 70753d3a9e545446504b01a029bb3f562f3e8454 /intern/cycles | |
| parent | 3863aa91140a8fde20a5add8ada976ee764b735b (diff) | |
Cycles: attempted fix for error building with sse/mtune optimization flags.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | intern/cycles/SConscript | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 86fb6e49e33..c0992aae7da 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -8,7 +8,9 @@ include(cmake/external_libs.cmake) # 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}") diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index 27943ed6ac6..5ecd52d369f 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -24,10 +24,12 @@ defs.append('WITH_MULTI') 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()) |