Ported SSE2 build target from Singularity, patch by Shyotl. Note that the package project still currently only supports 'Release'

1 files changed, 35 insertions, 6 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 1a24a41..7d50f25 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -1,6 +1,6 @@
 # -*- cmake -*-
 #
-# Compilation options shared by all Second Life components.
+# Compilation options shared by all viewer components.
 
 include(Variables)
 
@@ -10,6 +10,8 @@ include(Variables)
 set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
 set(CMAKE_CXX_FLAGS_RELEASE
     "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELEASESSE2
+    "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
     "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
 
@@ -17,7 +19,7 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
 # Available build types / configurations.
 # Add our current build type first, to coax Xcode into selecting it by default.
 
-set(TYPES ${CMAKE_BUILD_TYPE} RelWithDebInfo Release Debug)
+set(TYPES ${CMAKE_BUILD_TYPE} RelWithDebInfo Release ReleaseSSE2 Debug)
 list(REMOVE_DUPLICATES TYPES)
 set(CMAKE_CONFIGURATION_TYPES ${TYPES} CACHE STRING "Supported build types." FORCE)
 unset(TYPES)
@@ -44,12 +46,18 @@ if (WINDOWS)
       CACHE STRING "C++ compiler release-with-debug options" FORCE)
   if (MSVC80)
       set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /GT /Zi /MD"
-      CACHE STRING "C++ compiler release options" FORCE)
+                "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /GT /Zi /MD"
+                CACHE STRING "C++ compiler release options" FORCE)
+          set(CMAKE_CXX_FLAGS_RELEASESSE2
+                "${CMAKE_CXX_FLAGS_RELEASESSE2} /O2 /Ob2 /Oi /Ot /GT /Zi /MD /arch:SSE2"
+                CACHE STRING "C++ compiler release (SSE2 optimized) options" FORCE)
   else (MSVC80)
       set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD"
-      CACHE STRING "C++ compiler release options" FORCE)
+                "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD"
+                CACHE STRING "C++ compiler release options" FORCE)
+          set(CMAKE_CXX_FLAGS_RELEASESSE2
+                "${CMAKE_CXX_FLAGS_RELEASESSE2} ${LL_CXX_FLAGS} /O2 /Zi /MD /arch:SSE2"
+                CACHE STRING "C++ compiler release (SSE2 optimized) options" FORCE)
   endif (MSVC80)
 
   set(CMAKE_CXX_STANDARD_LIBRARIES "")
@@ -73,6 +81,9 @@ if (WINDOWS)
     set(CMAKE_CXX_FLAGS_RELEASE
       "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
       CACHE STRING "C++ compiler release options" FORCE)
+        set(CMAKE_CXX_FLAGS_RELEASESSE2
+          "${CMAKE_CXX_FLAGS_RELEASESSE2} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
+          CACHE STRING "C++ compiler release (SSE2 optimized) options" FORCE)
    
     add_definitions(
       /Zc:wchar_t-
@@ -186,10 +197,12 @@ if (LINUX)
        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")
     endif (${ARCH} STREQUAL "x86_64")
+        set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2} -mfpmath=sse2 -msse2")
   endif (VIEWER)
 
   set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
   set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")
+  set(CMAKE_CXX_FLAGS_RELEASESSE2 "-O2 ${CMAKE_CXX_FLAGS_RELEASESSE2}")
 endif (LINUX)
 
 
@@ -203,6 +216,8 @@ if (DARWIN)
   # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
   set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+  set(CMAKE_CXX_FLAGS_RELEASESSE2 "-msse2 -mfpmath=sse ${CMAKE_CXX_FLAGS_RELEASESSE2}") 
+  set(CMAKE_C_FLAGS_RELEASESSE2 "-msse2 -mfpmath=sse ${CMAKE_C_FLAGS_RELEASESSE2}")
 endif (DARWIN)
 
 
@@ -255,3 +270,17 @@ endif (STANDALONE)
 if(SERVER)
   include_directories(${LIBS_PREBUILT_DIR}/include/havok)
 endif(SERVER)
+
+SET(CMAKE_EXE_LINKER_FLAGS_RELEASESSE2
+    "${CMAKE_EXE_LINKER_FLAGS_RELEASE}" CACHE STRING
+    "Flags used for linking binaries under SSE2 optimized build."
+    FORCE )
+SET(CMAKE_SHARED_LINKER_FLAGS_RELEASESSE2
+    "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}" CACHE STRING
+    "Flags used by the shared libraries linker under SSE2 optimized build."
+    FORCE )
+MARK_AS_ADVANCED(
+    CMAKE_CXX_FLAGS_RELEASESSE2
+    CMAKE_C_FLAGS_RELEASESSE2
+    CMAKE_EXE_LINKER_FLAGS_RELEASESSE2
+    CMAKE_SHARED_LINKER_FLAGS_RELEASESSE2 )