diff options
author | Merov Linden <merov@lindenlab.com> | 2011-03-18 18:09:28 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2011-03-18 18:09:28 -0700 |
commit | cb1c85261e768c9653ed40bf6160e7cc7ca9ce74 (patch) | |
tree | a5cccd2fca9fefe4717168f108bcb8d18fe98cf5 /indra/media_plugins | |
parent | c2e88db89a8ba111efd0c1b61cc8dec400a007cb (diff) | |
parent | 6c0fbdafaed93b90354b37513a3b61dee56fb8b2 (diff) |
Pull in viewer-development
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..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 |