diff options
| author | Jacek Antonelli | 2010-11-13 15:28:17 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2010-11-13 15:28:17 -0600 |
| commit | 0bd60279fe449c9c08b144213d497eda89fd4ded (patch) | |
| tree | e25f4416262c508db96b192c670e4c8c10df54cf /linden/indra | |
| parent | Ported keyboard shortcut for align tool from Ascent, by Beeks. Has the follow... (diff) | |
| download | meta-impy-0bd60279fe449c9c08b144213d497eda89fd4ded.zip meta-impy-0bd60279fe449c9c08b144213d497eda89fd4ded.tar.gz meta-impy-0bd60279fe449c9c08b144213d497eda89fd4ded.tar.bz2 meta-impy-0bd60279fe449c9c08b144213d497eda89fd4ded.tar.xz | |
Disable SSE4 on Mac (temporarily).
GCC 4.0 on Mac OS X 10.5 can't handle SSE4, GCC 4.2 fails.
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/cmake/00-Common.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index c3aa9ea..7e85ce0 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake | |||
| @@ -194,8 +194,8 @@ if (DARWIN) | |||
| 194 | add_definitions(-DLL_DARWIN=1) | 194 | add_definitions(-DLL_DARWIN=1) |
| 195 | set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first") | 195 | set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first") |
| 196 | set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}") | 196 | set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}") |
| 197 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch -msse3 -msse4.1 -msse4.2 -mssse3 -w") | 197 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch -msse3 -mssse3 -w") |
| 198 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch -msse3 -msse4.1 -msse4.2 -mssse3 -w") | 198 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch -msse3 -mssse3 -w") |
| 199 | # NOTE: it's critical that the optimization flag is put in front. | 199 | # NOTE: it's critical that the optimization flag is put in front. |
| 200 | # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered. | 200 | # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered. |
| 201 | set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") | 201 | set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") |