summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/cmake/00-Common.cmake5
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 5f209a6675..5baaf6d12e 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -148,6 +148,7 @@ Blakar Ogre
blino Nakamura
VWR-17
Boroondas Gupte
+ OPEN-99
SNOW-278
VWR-233
WEB-262
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 802db82091..f0e2890448 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -169,7 +169,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=pentium3 -mfpmath=sse)
+ if (WORD_SIZE EQUAL 32)
+ add_definitions(-march=pentium3)
+ 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