|
Line
Link Here
|
| 0 |
-- a/CMakeLists.txt |
0 |
++ b/CMakeLists.txt |
|
Lines 98-103
Link Here
|
| 98 |
#----------------------------------------------------------------------------- |
98 |
#----------------------------------------------------------------------------- |
| 99 |
# Load some macros. |
99 |
# Load some macros. |
| 100 |
include(build_files/cmake/macros.cmake) |
100 |
include(build_files/cmake/macros.cmake) |
|
|
101 |
include(CMakeDependentOption) |
| 101 |
|
102 |
|
| 102 |
|
103 |
|
| 103 |
#----------------------------------------------------------------------------- |
104 |
#----------------------------------------------------------------------------- |
|
Lines 354-359
Link Here
|
| 354 |
endif() |
355 |
endif() |
| 355 |
option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ${_init_INPUT_NDOF}) |
356 |
option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ${_init_INPUT_NDOF}) |
| 356 |
option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON) |
357 |
option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON) |
|
|
358 |
cmake_dependent_option(WITH_SSE2 "SSE2 optimizations" ON WITH_RAYOPTIMIZATION OFF) |
| 357 |
if(UNIX AND NOT APPLE) |
359 |
if(UNIX AND NOT APPLE) |
| 358 |
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON) |
360 |
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON) |
| 359 |
option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF) |
361 |
option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF) |
|
Lines 2325-2331
Link Here
|
| 2325 |
set(PLATFORM_CFLAGS " ${COMPILER_SSE_FLAG} ${PLATFORM_CFLAGS}") |
2327 |
set(PLATFORM_CFLAGS " ${COMPILER_SSE_FLAG} ${PLATFORM_CFLAGS}") |
| 2326 |
add_definitions(-D__SSE__ -D__MMX__) |
2328 |
add_definitions(-D__SSE__ -D__MMX__) |
| 2327 |
endif() |
2329 |
endif() |
| 2328 |
if(SUPPORT_SSE2_BUILD) |
2330 |
if(WITH_SSE2 AND SUPPORT_SSE2_BUILD) |
| 2329 |
set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}") |
2331 |
set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}") |
| 2330 |
add_definitions(-D__SSE2__) |
2332 |
add_definitions(-D__SSE2__) |
| 2331 |
if(NOT SUPPORT_SSE_BUILD) # dont double up |
2333 |
if(NOT SUPPORT_SSE_BUILD) # dont double up |
