summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-03-23 11:36:00 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-03-23 11:36:00 -0700
commit3ad81bb4a642d25018b773d2ef005380664d8170 (patch)
treeb1bbf66c0babf6c541858b34d4a7f66ad19308b0 /indra/media_plugins
parenta2c659378b8b7c8a4128c61b5cde91eccc9db4e6 (diff)
parent62a958d341532287519a23a362ff7aebd501e1c9 (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..bf74f81809 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