diff options
Diffstat (limited to 'linden/indra/cmake')
-rw-r--r-- | linden/indra/cmake/GStreamer.cmake | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake index b4b984d..7b380a8 100644 --- a/linden/indra/cmake/GStreamer.cmake +++ b/linden/indra/cmake/GStreamer.cmake | |||
@@ -54,10 +54,6 @@ if (WINDOWS) | |||
54 | 54 | ||
55 | else (WINDOWS) | 55 | else (WINDOWS) |
56 | 56 | ||
57 | include(FindPkgConfig) | ||
58 | |||
59 | pkg_check_modules(GSTREAMER REQUIRED gstreamer-0.10) | ||
60 | pkg_check_modules(GSTREAMER_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10) | ||
61 | set(GSTREAMER_INCLUDE_DIRS | 57 | set(GSTREAMER_INCLUDE_DIRS |
62 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10 | 58 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10 |
63 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 | 59 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 |
@@ -66,9 +62,11 @@ else (WINDOWS) | |||
66 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2 | 62 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2 |
67 | ) | 63 | ) |
68 | 64 | ||
69 | # We don't need to explicitly link against gstreamer itself, because | ||
70 | # LLMediaImplGStreamer probes for the system's copy at runtime. | ||
71 | set(GSTREAMER_LIBRARIES | 65 | set(GSTREAMER_LIBRARIES |
66 | gstvideo-0.10 | ||
67 | gstaudio-0.10 | ||
68 | gstbase-0.10 | ||
69 | gstreamer-0.10 | ||
72 | gobject-2.0 | 70 | gobject-2.0 |
73 | gmodule-2.0 | 71 | gmodule-2.0 |
74 | dl | 72 | dl |