diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 15:28:30 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 15:28:30 +0000 |
| commit | b809b871369f5aeced50a81467f539cab9a9ed4e (patch) | |
| tree | 833bd09a40f1364b6fa4ab892adb75d87c0461fa | |
| parent | 69ed7058b4626780374b307fe126a2b73c703918 (diff) | |
EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a mouse move event
restore part of this fix - glib-compatible Qt needs it, and flash needs a glib-compatible Qt.
| -rw-r--r-- | indra/media_plugins/webkit/CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index c4dd5fd79d..a46ffefdac 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -9,6 +9,7 @@ include(LLPlugin) include(LLMath) include(LLRender) include(LLWindow) +include(LLUI) include(Linking) include(PluginAPI) include(MediaPluginBase) @@ -38,7 +39,7 @@ add_library(media_plugin_webkit ${media_plugin_webkit_SOURCE_FILES} ) -target_link_libraries(media_plugin_webkit +set(media_plugin_webkit_LINK_LIBRARIES ${LLPLUGIN_LIBRARIES} ${MEDIA_PLUGIN_BASE_LIBRARIES} ${LLCOMMON_LIBRARIES} @@ -46,6 +47,14 @@ target_link_libraries(media_plugin_webkit ${PLUGIN_API_WINDOWS_LIBRARIES} ) +if (LINUX) + list(APPEND media_plugin_webkit_LINK_LIBRARIES + ${UI_LIBRARIES} # for glib/GTK + ) +endif (LINUX) + +target_link_libraries(media_plugin_webkit ${media_plugin_webkit_LINK_LIBRARIES}) + add_dependencies(media_plugin_webkit ${LLPLUGIN_LIBRARIES} ${MEDIA_PLUGIN_BASE_LIBRARIES} |