diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-24 07:48:06 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-24 07:48:06 -0400 |
commit | 4386bb173b17ca499e0c63809b8c7227da3f0e1c (patch) | |
tree | 7893d4c6d3eccfaf0839d48618b32de5628cd218 /indra/media_plugins/winmmshim/CMakeLists.txt | |
parent | eef9b265b951337d0633d18186dad2b734b30d5a (diff) | |
parent | 1c375a8c880354432da2b218c321ed708497e161 (diff) |
merge changes for storm-1018
Diffstat (limited to 'indra/media_plugins/winmmshim/CMakeLists.txt')
-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 |