diff options
| author | Richard Linden <none@none> | 2011-03-17 14:32:59 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-17 14:32:59 -0700 |
| commit | d5c37e8b69cb39204d9c1f7e19a46a10c668b73a (patch) | |
| tree | d994e98d79ca4e56b20b271c528ca813d4c4c61a /indra/media_plugins | |
| parent | 313b77fd269665d059e64eee079d21da2a3129c1 (diff) | |
| parent | a024493c04aea26b523d52971ab9cc1c9df5d08b (diff) | |
Automated merge with http://hg.secondlife.com/viewer-pre-beta
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 |