diff options
author | Glenn Glazer <coyot@lindenlab.com> | 2016-03-08 13:32:28 -0800 |
---|---|---|
committer | Glenn Glazer <coyot@lindenlab.com> | 2016-03-08 13:32:28 -0800 |
commit | ec683bb9cf6688633d8bc7ecbdf72f7cbc14d349 (patch) | |
tree | 59ada405958cd7764a96cfa35ccc89e83706b5af /indra/media_plugins/quicktime/CMakeLists.txt | |
parent | daf8b882a12cf903d180f6303065d7b83f7a1958 (diff) | |
parent | 5a5c023e291990a463b1a91846ce82c70da8daab (diff) |
pull from trunk
Diffstat (limited to 'indra/media_plugins/quicktime/CMakeLists.txt')
-rwxr-xr-x | indra/media_plugins/quicktime/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/media_plugins/quicktime/CMakeLists.txt b/indra/media_plugins/quicktime/CMakeLists.txt index 58391007ff..d7a1874bf3 100755 --- a/indra/media_plugins/quicktime/CMakeLists.txt +++ b/indra/media_plugins/quicktime/CMakeLists.txt @@ -63,7 +63,8 @@ if (WINDOWS) set_target_properties( media_plugin_quicktime PROPERTIES - LINK_FLAGS "/MANIFEST:NO" + LINK_FLAGS "/MANIFEST:NO /SAFESEH:NO /NODEFAULTLIB:LIBCMT" + LINK_FLAGS_DEBUG "/MANIFEST:NO /SAFESEH:NO /NODEFAULTLIB:LIBCMTD" ) endif (WINDOWS) |