From 385a8ad63e8c6458112f2f4031e0a7fc1a12c38f Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Tue, 28 Sep 2010 03:12:54 +0200
Subject: RED-561: Optimization flags used during --Type=Debug (linux x86_64)

See http://redmine.imprudenceviewer.org/issues/561
Fixed erroneous use of optimization flags when not compiling Release.
Also removed -DLL_VECTORIZE from compile options: that is set in
a header file (llv4math.h), not on the commandline.
Patch affects only 64 bit linux.
---
 linden/indra/cmake/00-Common.cmake   | 21 ++++-----------------
 linden/indra/newview/llappviewer.cpp |  2 +-
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index d1f379c..3497ec9 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -169,23 +169,10 @@ if (LINUX)
       add_definitions(-fno-stack-protector)
     endif (NOT STANDALONE)
     if (${ARCH} STREQUAL "x86_64")
-       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
-			)
-
+       # 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")
     endif (${ARCH} STREQUAL "x86_64")
   endif (VIEWER)
 
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 817517e..0fbcafc 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -61,7 +61,7 @@
 #include "llviewerwindow.h"
 #include "llviewerdisplay.h"
 #include "llviewermedia.h"
-
+#include "llv4math.h"		// for LL_VECTORIZE
 
 #include "llviewermessage.h"
 #include "llviewerobjectlist.h"
-- 
cgit v1.1