diff options
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/cmake/00-Common.cmake | 2 | ||||
-rw-r--r-- | linden/indra/cmake/CopyWinLibs.cmake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index afcecfc..325426e 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 /GT /Zi /MT" | 36 | "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /GT /Zi /MD" |
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 |
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index 3adba60..11f70b9 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake | |||
@@ -173,6 +173,7 @@ if (MSVC80) | |||
173 | PATHS | 173 | PATHS |
174 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT | 174 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT |
175 | NO_DEFAULT_PATH | 175 | NO_DEFAULT_PATH |
176 | NO_DEFAULT_PATH | ||
176 | ) | 177 | ) |
177 | 178 | ||
178 | if(EXISTS ${debug_msvc8_redist_path}) | 179 | if(EXISTS ${debug_msvc8_redist_path}) |
@@ -195,6 +196,7 @@ if (MSVC80) | |||
195 | PATHS | 196 | PATHS |
196 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT | 197 | [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT |
197 | NO_DEFAULT_PATH | 198 | NO_DEFAULT_PATH |
199 | NO_DEFAULT_PATH | ||
198 | ) | 200 | ) |
199 | 201 | ||
200 | if(EXISTS ${release_msvc8_redist_path}) | 202 | if(EXISTS ${release_msvc8_redist_path}) |