diff options
author | Dave Parks <davep@lindenlab.com> | 2011-04-15 14:13:57 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-04-15 14:13:57 -0500 |
commit | af6133dfa5c6f4e3a00752f2885bd2f30c0e1c8c (patch) | |
tree | 71335616be646d8dd8e793732b508ea77ed197db /indra/media_plugins | |
parent | 7e7ff13b49f6f806a385bd92d675123ff7db7232 (diff) | |
parent | 6a491424677086a84d180ace0b91f1eefaeb67ba (diff) |
merge
Diffstat (limited to 'indra/media_plugins')
-rw-r--r-- | indra/media_plugins/winmmshim/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/media_plugins/winmmshim/CMakeLists.txt b/indra/media_plugins/winmmshim/CMakeLists.txt index 3e3a988310..bf74f81809 100644 --- a/indra/media_plugins/winmmshim/CMakeLists.txt +++ b/indra/media_plugins/winmmshim/CMakeLists.txt @@ -3,12 +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")
+# *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 |