diff options
author | McCabe Maxsted | 2009-09-26 23:24:09 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-09-26 23:24:09 -0700 |
commit | 403afa9265bb6a775bdb69b9dbbe04e79ee10899 (patch) | |
tree | aa0557a0e42a8eef93860489338f08de8fcbdc72 | |
parent | Changed radar label from 'meters' to 'm' (diff) | |
download | meta-impy-403afa9265bb6a775bdb69b9dbbe04e79ee10899.zip meta-impy-403afa9265bb6a775bdb69b9dbbe04e79ee10899.tar.gz meta-impy-403afa9265bb6a775bdb69b9dbbe04e79ee10899.tar.bz2 meta-impy-403afa9265bb6a775bdb69b9dbbe04e79ee10899.tar.xz |
Removed overridden /oy compiler option
-rw-r--r-- | ChangeLog.txt | 5 | ||||
-rw-r--r-- | linden/indra/cmake/00-Common.cmake | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 61d2de6..40e5956 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -12,6 +12,11 @@ | |||
12 | 12 | ||
13 | 2009-09-26 McCabe Maxsted <hakushakukun@gmail.com> | 13 | 2009-09-26 McCabe Maxsted <hakushakukun@gmail.com> |
14 | 14 | ||
15 | * Removed overridden /oy compiler option. | ||
16 | |||
17 | modified: linden/indra/cmake/00-Common.cmake | ||
18 | |||
19 | |||
15 | * Changed radar label from 'meters' to 'm'. | 20 | * Changed radar label from 'meters' to 'm'. |
16 | 21 | ||
17 | modified: linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml | 22 | 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) | |||
33 | CACHE STRING "C++ compiler release-with-debug options" FORCE) | 33 | CACHE STRING "C++ compiler release-with-debug options" FORCE) |
34 | if (MSVC80) | 34 | if (MSVC80) |
35 | set(CMAKE_CXX_FLAGS_RELEASE | 35 | set(CMAKE_CXX_FLAGS_RELEASE |
36 | "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /Oy /GT /Zi /MT" | 36 | "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /GT /Zi /MT" |
37 | CACHE STRING "C++ compiler release options" FORCE) | 37 | CACHE STRING "C++ compiler release options" FORCE) |
38 | else (MSVC80) | 38 | else (MSVC80) |
39 | set(CMAKE_CXX_FLAGS_RELEASE | 39 | set(CMAKE_CXX_FLAGS_RELEASE |