6 files changed, 61 insertions, 19 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 7d50f25..81bfbdf 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -195,7 +195,8 @@ if (LINUX)
        # This rather needs to be done elsewhere
        # anyway these are the flags for the 64bit releases:
        add_definitions(-DLINUX64=1 -pipe)
-       set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers")
+       # with -ffast-math lloctree crashes teleporting to mega regions, and it didn't do much for us anyway
+       set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2  -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers")
     endif (${ARCH} STREQUAL "x86_64")
         set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2} -mfpmath=sse2 -msse2")
   endif (VIEWER)
@@ -232,6 +233,15 @@ if (LINUX OR DARWIN)
 
   set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}")
   set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}")
+
+  if (WORD_SIZE EQUAL 32)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+  elseif (WORD_SIZE EQUAL 64)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
+  endif (WORD_SIZE EQUAL 32)
+
 endif (LINUX OR DARWIN)
 
 
diff --git a/linden/indra/cmake/GStreamer010Plugin.cmake b/linden/indra/cmake/GStreamer010Plugin.cmake
index 9d2c553..d05cb9c 100644
--- a/linden/indra/cmake/GStreamer010Plugin.cmake
+++ b/linden/indra/cmake/GStreamer010Plugin.cmake
@@ -21,13 +21,22 @@ else (STANDALONE)
                 ${LIBS_PREBUILT_DIR}/include/libxml2
                 )
   else (WINDOWS)
-    use_prebuilt_binary(glib)                   # gstreamer needs glib
-        use_prebuilt_binary(libxml)
-        set(GSTREAMER010_INCLUDE_DIRS
-                ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
-                ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
-                ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
-                )
+      use_prebuilt_binary(glib)                 # gstreamer needs glib
+      if (DARWIN)
+
+         use_prebuilt_binary(libxml)
+         set(GSTREAMER010_INCLUDE_DIRS
+                ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
+                ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
+                ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
+            )
+       else (DARWIN)
+         add_definitions(-DGST_DISABLE_XML -DGST_DISABLE_LOADSAVE)
+         set(GSTREAMER010_INCLUDE_DIRS
+                ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
+                ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
+            )
+      endif (DARWIN)
   endif (WINDOWS)
 
 endif (STANDALONE)
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake
index eb9c004..6b7ded3 100644
--- a/linden/indra/cmake/Variables.cmake
+++ b/linden/indra/cmake/Variables.cmake
@@ -50,8 +50,30 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set(LINUX ON BOOl FORCE)
-  execute_process(COMMAND uname -m COMMAND sed s/i.86/i686/
-                  OUTPUT_VARIABLE ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  # If someone has specified a word size, use that to determine the
+  # architecture.  Otherwise, let the architecture specify the word size.
+
+  if ("$ENV{WORD_SIZE}" MATCHES "32")
+      set(WORD_SIZE 32)
+  elseif ("$ENV{WORD_SIZE}" MATCHES "64")
+      set(WORD_SIZE 64)
+  endif ()
+
+  if (WORD_SIZE EQUAL 32)
+    set(ARCH i686)
+  elseif (WORD_SIZE EQUAL 64)
+    set(ARCH x86_64)
+  else (WORD_SIZE EQUAL 32)
+    execute_process(COMMAND uname -m COMMAND sed s/i.86/i686/
+                    OUTPUT_VARIABLE ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (ARCH STREQUAL x86_64)
+      set(WORD_SIZE 64)
+    else (ARCH STREQUAL x86_64)
+      set(WORD_SIZE 32)
+    endif (ARCH STREQUAL x86_64)
+  endif (WORD_SIZE EQUAL 32)
+
   set(LL_ARCH ${ARCH}_linux)
   set(LL_ARCH_DIR ${ARCH}-linux)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 38d0444..bf33490 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -5,18 +5,12 @@ if (NOT STANDALONE)
   use_prebuilt_binary(libuuid)
   use_prebuilt_binary(vivox)
   if(LINUX)
-    if (${ARCH} STREQUAL "x86_64")
-     use_prebuilt_binary(32bitcompatibilitylibs)
-        endif (${ARCH} STREQUAL "x86_64")
     use_prebuilt_binary(fontconfig)
   endif(LINUX)
 else (NOT STANDALONE)
   # Download there even when using standalone.
   set(STANDALONE OFF)
   use_prebuilt_binary(vivox)
-  if(LINUX AND ${ARCH} STREQUAL "x86_64")
-    use_prebuilt_binary(32bitcompatibilitylibs)
-  endif(LINUX AND ${ARCH} STREQUAL "x86_64")
   set(STANDALONE ON)
 endif(NOT STANDALONE)
 
diff --git a/linden/indra/cmake/WebKitLibPlugin.cmake b/linden/indra/cmake/WebKitLibPlugin.cmake
index a4befa4..034eed5 100644
--- a/linden/indra/cmake/WebKitLibPlugin.cmake
+++ b/linden/indra/cmake/WebKitLibPlugin.cmake
@@ -29,6 +29,9 @@ if (STANDALONE)
     set(WEBKITLIBPLUGIN OFF CACHE BOOL
         "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
 else (STANDALONE)
+  if(LINUX)
+     use_prebuilt_binary(kokua-qt)
+  endif(LINUX)
     use_prebuilt_binary(llqtwebkit)
     set(WEBKITLIBPLUGIN ON CACHE BOOL
         "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
@@ -62,8 +65,6 @@ elseif (LINUX)
      else (STANDALONE)
        set(WEBKIT_PLUGIN_LIBRARIES
         llqtwebkit
-        qgif
-        qjpeg
         QtWebKit
         QtOpenGL
         QtNetwork
@@ -74,6 +75,8 @@ elseif (LINUX)
         X11
         Xrender
         GL
+        jscore
         )
+
      endif (STANDALONE)
 endif (WINDOWS)
diff --git a/linden/indra/cmake/ZLIB.cmake b/linden/indra/cmake/ZLIB.cmake
index 48e5130..8a16a0e 100644
--- a/linden/indra/cmake/ZLIB.cmake
+++ b/linden/indra/cmake/ZLIB.cmake
@@ -17,6 +17,10 @@ else (STANDALONE)
     set(ZLIB_LIBRARIES z)
   endif (WINDOWS)
   if (WINDOWS OR LINUX)
-    set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib)
+    if(LINUX AND ${ARCH} STREQUAL "x86_64")
+      set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+    else(LINUX AND ${ARCH} STREQUAL "x86_64")
+      set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib)
+    endif(LINUX AND ${ARCH} STREQUAL "x86_64")
   endif (WINDOWS OR LINUX)
 endif (STANDALONE)