From 403afa9265bb6a775bdb69b9dbbe04e79ee10899 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 26 Sep 2009 23:24:09 -0700 Subject: Removed overridden /oy compiler option --- ChangeLog.txt | 5 +++++ linden/indra/cmake/00-Common.cmake | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 61d2de6..40e5956 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -12,6 +12,11 @@ 2009-09-26 McCabe Maxsted + * Removed overridden /oy compiler option. + + modified: linden/indra/cmake/00-Common.cmake + + * Changed radar label from 'meters' to 'm'. modified: linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 2d691ad..e15e8a2 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake @@ -33,7 +33,7 @@ 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 /Oy /GT /Zi /MT" + "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /GT /Zi /MT" CACHE STRING "C++ compiler release options" FORCE) else (MSVC80) set(CMAKE_CXX_FLAGS_RELEASE -- cgit v1.1