aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake/GStreamer.cmake
diff options
context:
space:
mode:
authorJacek Antonelli2009-10-09 19:53:10 -0500
committerJacek Antonelli2009-10-09 19:53:10 -0500
commitee2ed21aacb473301d36b8f4c450cb96c3ae39d3 (patch)
treecce626317343ba0f23b4af03c2d9b4bf7e7bdf78 /linden/indra/cmake/GStreamer.cmake
parentUpdated version info to 1.2.0 beta 2, added changelog banner (diff)
downloadmeta-impy-ee2ed21aacb473301d36b8f4c450cb96c3ae39d3.zip
meta-impy-ee2ed21aacb473301d36b8f4c450cb96c3ae39d3.tar.gz
meta-impy-ee2ed21aacb473301d36b8f4c450cb96c3ae39d3.tar.bz2
meta-impy-ee2ed21aacb473301d36b8f4c450cb96c3ae39d3.tar.xz
Updated and added some Linux libs.
Updated: glib, gstreamer, gtk-etc, ogg-vorbis, openal, libxml Added: gstreamer-plugins, theora
Diffstat (limited to '')
-rw-r--r--linden/indra/cmake/GStreamer.cmake15
1 files changed, 9 insertions, 6 deletions
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 8bfad11..51e1550 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -1,18 +1,19 @@
1# -*- cmake -*- 1# -*- cmake -*-
2include(Prebuilt) 2include(Prebuilt)
3 3
4 # possible libxml should have its own .cmake file instead 4 # Maybe libxml and glib should have their own .cmake files
5 use_prebuilt_binary(libxml) 5 use_prebuilt_binary(libxml)
6 use_prebuilt_binary(glib)
7
6 set(GSTREAMER_FOUND ON FORCE BOOL) 8 set(GSTREAMER_FOUND ON FORCE BOOL)
7 set(GSTREAMER_PLUGINS_BASE_FOUND ON FORCE BOOL) 9 set(GSTREAMER_PLUGINS_BASE_FOUND ON FORCE BOOL)
10
8 use_prebuilt_binary(gstreamer) 11 use_prebuilt_binary(gstreamer)
12 use_prebuilt_binary(gstreamer-plugins)
9 13
10if (WINDOWS) 14if (WINDOWS)
11 15
12 use_prebuilt_binary(libxml)
13 use_prebuilt_binary(iconv) 16 use_prebuilt_binary(iconv)
14 use_prebuilt_binary(glib)
15 use_prebuilt_binary(gstreamer-plugins)
16 set(GSTREAMER_FOUND ON FORCE BOOL) 17 set(GSTREAMER_FOUND ON FORCE BOOL)
17 set(GSTREAMER_INCLUDE_DIRS 18 set(GSTREAMER_INCLUDE_DIRS
18 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib 19 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib
@@ -63,7 +64,7 @@ else (WINDOWS)
63 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2 64 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
64 ) 65 )
65 66
66 if (DARWIN) 67 if (DARWIN) # Mac
67 68
68 find_library( XML2_LIB 69 find_library( XML2_LIB
69 NAMES xml2.2 70 NAMES xml2.2
@@ -89,7 +90,9 @@ else (WINDOWS)
89 ${XML2_LIB} 90 ${XML2_LIB}
90 ) 91 )
91 92
92 else (DARWIN) 93 else (DARWIN) # Linux
94
95 use_prebuilt_binary(theora)
93 96
94 set(GSTREAMER_LIBRARIES 97 set(GSTREAMER_LIBRARIES
95 gstvideo-0.10 98 gstvideo-0.10