diff options
| author | Richard Linden <none@none> | 2011-03-03 21:02:09 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-03 21:02:09 -0800 |
| commit | 2740879205f1db5f29f228a96c80e1961e4b9226 (patch) | |
| tree | 6135d36dc8736c79a8b30e9ca8ad3e3c21c937c1 /indra | |
| parent | 5e0b45ad6cac39476f78ffa8d486f06eee53797b (diff) | |
SOCIAL-641 FIX C++ Runtime error in SLvoice.exe when launching Standard Skin on Windows
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/media_plugins/winmmshim/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/media_plugins/winmmshim/CMakeLists.txt b/indra/media_plugins/winmmshim/CMakeLists.txt index 387214088f..3e3a988310 100644 --- a/indra/media_plugins/winmmshim/CMakeLists.txt +++ b/indra/media_plugins/winmmshim/CMakeLists.txt @@ -3,6 +3,12 @@ project(winmm_shim) ### winmm_shim +# *HACK - override msvcrt implementation (intialized on 00-Common) to be
+# statically linked for winmm.dll this relies on vc taking the last flag on
+# the command line
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
set(winmm_shim_SOURCE_FILES forwarding_api.cpp |