summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2011-03-16 22:44:18 +0000
committerTofu Buzzard <no-email>2011-03-16 22:44:18 +0000
commit752b3fdbe044069635a2c6cd000c481561985954 (patch)
treea162616b10fbabe65bf3a568c408e10e3cfd253a /indra/media_plugins
parentb092de554c7745d7c3c19bd30803640f36431da2 (diff)
parent4b54ec7965cd874af4d0eef381d0bc9fe06cff04 (diff)
merge
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/winmmshim/CMakeLists.txt6
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