diff options
| author | McCabe Maxsted | 2011-03-15 17:17:10 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-03-15 17:17:10 -0700 |
| commit | b195e7a0d78d66d256688be01385cede58b0894e (patch) | |
| tree | d6a8dee55043935e44dad6f102b1cc4cfb3743f4 /linden/indra | |
| parent | Don't use the build window keyboard shortcuts when the UI has focus (except f... (diff) | |
| download | meta-impy-b195e7a0d78d66d256688be01385cede58b0894e.zip meta-impy-b195e7a0d78d66d256688be01385cede58b0894e.tar.gz meta-impy-b195e7a0d78d66d256688be01385cede58b0894e.tar.bz2 meta-impy-b195e7a0d78d66d256688be01385cede58b0894e.tar.xz | |
Fixed missing use_prebuilt_binary(gstreamer-plugins) from GStreamer010Plugin.cmake and fixed some out-of-date lib requirements for Windows
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/cmake/GStreamer010Plugin.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/cmake/GStreamer010Plugin.cmake b/linden/indra/cmake/GStreamer010Plugin.cmake index ccad5be..9d2c553 100644 --- a/linden/indra/cmake/GStreamer010Plugin.cmake +++ b/linden/indra/cmake/GStreamer010Plugin.cmake | |||
| @@ -10,9 +10,8 @@ if (STANDALONE) | |||
| 10 | else (STANDALONE) | 10 | else (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 |