diff options
| author | Richard Linden <none@none> | 2011-03-07 06:43:13 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-07 06:43:13 -0800 |
| commit | f28d3a13d34937285f9d920d306896162ae91e4b (patch) | |
| tree | c1259d7b1d762fde12b480aaa93074974dc09bb0 /indra/media_plugins | |
| parent | 61e7c4166ffb6e16c42282d68a29365da5c62c5f (diff) | |
| parent | 25ad57c4b6db3793a0bb6fc1901ea6b0e969c17f (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social/
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 |