summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorleyla <leyla@leyla.com>2011-03-07 09:48:33 -0800
committerleyla <leyla@leyla.com>2011-03-07 09:48:33 -0800
commita1774c353e11e81c830523b1dd248119f8650ebf (patch)
treeafd0c19d6ab7ba10dabdc904e48a44bab80c01c7 /indra/media_plugins
parent6613aebf8802555a47e278d68eef5336763d7d87 (diff)
parentf28d3a13d34937285f9d920d306896162ae91e4b (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