diff options
| author | Callum Prentice <callum@gmail.com> | 2016-12-07 08:43:51 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2016-12-07 08:43:51 -0800 |
| commit | 70a42af076cbe6f12a265d508b4ed96af65d26ba (patch) | |
| tree | b8dd5848d4703f6320eb69c0376c492fa3a16bbb /indra/media_plugins | |
| parent | 15c043ec20eeaa08de21c0aed4e122b5095a98b0 (diff) | |
| parent | 232c3598547913ca6cb66593059497b413a9322c (diff) | |
Automated merge with tip of lindenlab/oz_viewer64
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/cef/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index 5db0a8fbfd..711e870ee4 100644 --- a/indra/media_plugins/cef/CMakeLists.txt +++ b/indra/media_plugins/cef/CMakeLists.txt @@ -97,8 +97,8 @@ if (WINDOWS) set_target_properties( media_plugin_cef PROPERTIES - LINK_FLAGS "/MANIFEST:NO /SAFESEH:NO /LTCG /NODEFAULTLIB:LIBCMT" - LINK_FLAGS_DEBUG "/MANIFEST:NO /SAFESEH:NO /NODEFAULTLIB:LIBCMTD" + LINK_FLAGS "/MANIFEST:NO /SAFESEH:NO /LTCG /NODEFAULTLIB:LIBCMT /IGNORE:4099" + LINK_FLAGS_DEBUG "/MANIFEST:NO /SAFESEH:NO /NODEFAULTLIB:LIBCMTD /IGNORE:4099" ) endif (WINDOWS) |