summaryrefslogtreecommitdiff
path: root/indra/media_plugins/winmmshim
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-31 16:51:41 -0400
committerOz Linden <oz@lindenlab.com>2011-03-31 16:51:41 -0400
commitc5ae838ce3cd8521b7b4817f153560e03a8dcc32 (patch)
tree7a489631ed3811ae52fab7bbf6b5a1075aa20e65 /indra/media_plugins/winmmshim
parentba0c369aa20cdbfd7940a2435dd3c6630f0d54ae (diff)
parent4047349ade461fa6bac43da2a14c6e7689918aa1 (diff)
pull improved avatar physics ui and other improvements from Seraph
Diffstat (limited to 'indra/media_plugins/winmmshim')
-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