diff options
| author | callum_linden <none@none> | 2015-03-24 00:42:42 +0100 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-03-24 00:42:42 +0100 |
| commit | ab9e83030671f0d309eada847af7055213dfe501 (patch) | |
| tree | 40f4ed2d4d84545dd9fad0b1e34969c6d2ffd4f0 /indra/media_plugins | |
| parent | d3477b738881acbdf2bd1cc7bfaadaaae3890be6 (diff) | |
Refer to new QuickTime third party package with fixes for VS2013 & re-add QuickTime media plugin
Diffstat (limited to 'indra/media_plugins')
| -rwxr-xr-x | indra/media_plugins/CMakeLists.txt | 8 | ||||
| -rwxr-xr-x | indra/media_plugins/quicktime/CMakeLists.txt | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/indra/media_plugins/CMakeLists.txt b/indra/media_plugins/CMakeLists.txt index 85318aea3b..956e8fe890 100755 --- a/indra/media_plugins/CMakeLists.txt +++ b/indra/media_plugins/CMakeLists.txt @@ -2,9 +2,11 @@ add_subdirectory(base) -add_subdirectory(webkit) +### add_subdirectory(webkit) -add_subdirectory(gstreamer010) +if (LINUX) + add_subdirectory(gstreamer010) +endif (LINUX) if (WINDOWS OR DARWIN) add_subdirectory(quicktime) @@ -14,4 +16,4 @@ if (WINDOWS) add_subdirectory(winmmshim) endif (WINDOWS) -add_subdirectory(example) +### add_subdirectory(example) 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) |