From 3ee498c4ed75d4dafc849aeb9dd3ef14f2385ef4 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <none@none>
Date: Sun, 22 Aug 2010 05:48:00 +0200
Subject: [PATCH] [Viewer/Build] - changed: compiler options for "Release with
Debug" builds - changed: compiler and linker options for "Release" builds
--HG--
branch : Viewer-Build
---
.hgpatchinfo/Viewer-Build.desc | 3 +++
indra/cmake/00-Common.cmake | 4 ++--
indra/newview/CMakeLists.txt | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
create mode 100644 .hgpatchinfo/Viewer-Build.desc
diff --git a/.hgpatchinfo/Viewer-Build.desc b/.hgpatchinfo/Viewer-Build.desc
new file mode 100644
index 0000000000..949cbb49bf
--- /dev/null
+++ b/.hgpatchinfo/Viewer-Build.desc
@@ -0,0 +1,3 @@
+[Viewer/Build]
+- changed: compiler options for "Release with Debug" builds
+- changed: compiler and linker options for "Release" builds
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index a114d6e778..2dd65e247d 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -38,10 +38,10 @@ if (WINDOWS)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP"
CACHE STRING "C++ compiler debug options" FORCE)
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
- "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP"
+ "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /Gm"
CACHE STRING "C++ compiler release-with-debug options" FORCE)
set(CMAKE_CXX_FLAGS_RELEASE
- "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP"
+ "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /Oi /Ot /GF /Gy /arch:SSE2"
CACHE STRING "C++ compiler release options" FORCE)
set(CMAKE_CXX_STANDARD_LIBRARIES "")
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 1ee7586d5f..bfb1674b8a 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1410,7 +1410,7 @@ if (WINDOWS)
if(MSVC71)
set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES")
else(MSVC71)
- set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map")
+ set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /OPT:REF")
endif(MSVC71)
set_target_properties(${VIEWER_BINARY_NAME}
--
GitLab