diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-13 17:43:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-13 17:43:45 -0400 |
| commit | 1f369cad59c1c2d5bfcf155ef86c887b1b40a0db (patch) | |
| tree | eca2e508735f530c8528881b5b66ad08d54e086b | |
| parent | 21bacab562f584feb2ee2e53c5772cad3735a52e (diff) | |
| parent | 0710fea0487152cdc8d2fb3f2c9ae1db0e1ee276 (diff) | |
merge changes for open-99
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/cmake/00-Common.cmake | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index a619d11737..68b0a4279f 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -203,6 +203,7 @@ Boroondas Gupte OPEN-29 OPEN-39 OPEN-39 + OPEN-99 SNOW-278 SNOW-503 SNOW-510 diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 2c974fb4ff..0266239454 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -171,7 +171,10 @@ if (LINUX) add_definitions(-fvisibility=hidden) # don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! The viewer doesn't need to catch SIGCHLD anyway. add_definitions(-DLL_IGNORE_SIGCHLD) - add_definitions(-march=pentium4 -mfpmath=sse) + if (WORD_SIZE EQUAL 32) + add_definitions(-march=pentium4) + endif (WORD_SIZE EQUAL 32) + add_definitions(-mfpmath=sse) #add_definitions(-ftree-vectorize) # THIS CRASHES GCC 3.1-3.2 if (NOT STANDALONE) # this stops us requiring a really recent glibc at runtime |