diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:42:04 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:42:04 -0400 |
| commit | eca30a22626b9a3e68e0e55f8da75614cd60d713 (patch) | |
| tree | d27f30f138553c1f0fbc0e61ef0d2ae036d54662 /indra/media_plugins | |
| parent | bc4444cd78067cbf11d3ffb210375a31a33f96bd (diff) | |
| parent | 3f05d552fec9d4d9a17c9131f445a7db0eef561f (diff) | |
QAR-1619: merge up to 2009-09-26 viewer/viewer-20
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/quicktime/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | indra/media_plugins/webkit/CMakeLists.txt | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/indra/media_plugins/quicktime/CMakeLists.txt b/indra/media_plugins/quicktime/CMakeLists.txt index db11c9ae21..f0b8f0d167 100644 --- a/indra/media_plugins/quicktime/CMakeLists.txt +++ b/indra/media_plugins/quicktime/CMakeLists.txt @@ -56,6 +56,14 @@ add_dependencies(media_plugin_quicktime ${LLCOMMON_LIBRARIES} ) +if (WINDOWS) + set_target_properties( + media_plugin_quicktime + PROPERTIES + LINK_FLAGS "/MANIFEST:NO" + ) +endif (WINDOWS) + if (QUICKTIME) add_definitions(-DLL_QUICKTIME_ENABLED=1) diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index d96477279d..5bccd589d8 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -52,6 +52,14 @@ add_dependencies(media_plugin_webkit ${LLCOMMON_LIBRARIES} ) +if (WINDOWS) + set_target_properties( + media_plugin_webkit + PROPERTIES + LINK_FLAGS "/MANIFEST:NO" + ) +endif (WINDOWS) + if (DARWIN) # Don't prepend 'lib' to the executable name, and don't embed a full path in the library's install name set_target_properties( |