2 files changed, 19 insertions, 3 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index c6b6858..d1f379c 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -169,7 +169,23 @@ if (LINUX)
       add_definitions(-fno-stack-protector)
     endif (NOT STANDALONE)
     if (${ARCH} STREQUAL "x86_64")
-       add_definitions( -DLINUX64=1 )
+       add_definitions( -DLINUX64=1
+                        #this rather needs to be done elsewhere
+                        #anyway these are the flags for the 64bit releases:
+                        -DLL_VECTORIZE=1
+                        -O2
+                        -fomit-frame-pointer
+                        -pipe 
+                        -mmmx
+                        -msse
+                        -mfpmath=sse
+                        -msse2
+                        -ffast-math
+                        -ftree-vectorize
+                        -fweb -fexpensive-optimizations
+                        -frename-registers
+                        )
+
     endif (${ARCH} STREQUAL "x86_64")
   endif (VIEWER)
 
diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 4a62ebd..7fe1040 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -4,9 +4,9 @@ include(Prebuilt)
 if (NOT STANDALONE)
   use_prebuilt_binary(libuuid)
   use_prebuilt_binary(vivox)
-   if(LINUX64)
+   if(LINUX AND ${ARCH} STREQUAL "x86_64")
      use_prebuilt_binary(32bitcompatibilitylibs)
-   endif(LINUX64)
+   endif(LINUX AND ${ARCH} STREQUAL "x86_64")
   use_prebuilt_binary(fontconfig)
 endif(NOT STANDALONE)