aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake/GStreamer010Plugin.cmake
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/cmake/GStreamer010Plugin.cmake')
-rw-r--r--linden/indra/cmake/GStreamer010Plugin.cmake10
1 files changed, 6 insertions, 4 deletions
diff --git a/linden/indra/cmake/GStreamer010Plugin.cmake b/linden/indra/cmake/GStreamer010Plugin.cmake
index ec9b828..9d2c553 100644
--- a/linden/indra/cmake/GStreamer010Plugin.cmake
+++ b/linden/indra/cmake/GStreamer010Plugin.cmake
@@ -10,9 +10,8 @@ if (STANDALONE)
10else (STANDALONE) 10else (STANDALONE)
11 11
12 # Possibly libxml and glib should have their own .cmake file instead... 12 # Possibly libxml and glib should have their own .cmake file instead...
13 use_prebuilt_binary(glib) # gstreamer needs glib 13 use_prebuilt_binary(gstreamer) # includes glib, libxml, and iconv on Windows
14 use_prebuilt_binary(libxml) 14 use_prebuilt_binary(gstreamer-plugins)
15 use_prebuilt_binary(gstreamer)
16 set(GSTREAMER010_FOUND ON FORCE BOOL) 15 set(GSTREAMER010_FOUND ON FORCE BOOL)
17 set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL) 16 set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL)
18 if (WINDOWS) 17 if (WINDOWS)
@@ -22,6 +21,8 @@ else (STANDALONE)
22 ${LIBS_PREBUILT_DIR}/include/libxml2 21 ${LIBS_PREBUILT_DIR}/include/libxml2
23 ) 22 )
24 else (WINDOWS) 23 else (WINDOWS)
24 use_prebuilt_binary(glib) # gstreamer needs glib
25 use_prebuilt_binary(libxml)
25 set(GSTREAMER010_INCLUDE_DIRS 26 set(GSTREAMER010_INCLUDE_DIRS
26 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10 27 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
27 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 28 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
@@ -38,7 +39,8 @@ if (WINDOWS)
38 gstaudio-0.10.lib 39 gstaudio-0.10.lib
39 gstbase-0.10.lib 40 gstbase-0.10.lib
40 gstreamer-0.10.lib 41 gstreamer-0.10.lib
41 gstvideo-0.10.lib 42 gstvideo-0.10.lib #slvideoplugin
43 gstinterfaces-0.10.lib
42 gobject-2.0 44 gobject-2.0
43 gmodule-2.0 45 gmodule-2.0
44 gthread-2.0 46 gthread-2.0