diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:22:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:22:45 -0400 |
| commit | 31edad0a226a14b5b87fe364c629f8450bda567c (patch) | |
| tree | e03ed820a759cd5d5c5f4f930762f73b0fe4cf24 /indra/media_plugins | |
| parent | b6e6ba224620e0b122062c88f40295c10ce8db2d (diff) | |
| parent | 742dd75751f65224d80eb4f7d20daf5a21776c5f (diff) | |
merge changes for storm-357
Diffstat (limited to 'indra/media_plugins')
| -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 |