diff options
| author | Jacek Antonelli | 2009-02-15 19:58:57 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-02-15 20:06:17 -0600 |
| commit | 7552080406d6c54e981d2e26f3826e7457cdd5fb (patch) | |
| tree | e613b774b600367635484fd71770c7984e720576 /linden/indra/cmake/GStreamer.cmake | |
| parent | Updated release notes for 1.1.0 RC1. (diff) | |
| parent | Merge branch '1.1.0-RC1-fixes' into next (diff) | |
| download | meta-impy-7552080406d6c54e981d2e26f3826e7457cdd5fb.zip meta-impy-7552080406d6c54e981d2e26f3826e7457cdd5fb.tar.gz meta-impy-7552080406d6c54e981d2e26f3826e7457cdd5fb.tar.bz2 meta-impy-7552080406d6c54e981d2e26f3826e7457cdd5fb.tar.xz | |
Merge commit 'mccabe/next' into next
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/cmake/GStreamer.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake index fc256a8..b4b984d 100644 --- a/linden/indra/cmake/GStreamer.cmake +++ b/linden/indra/cmake/GStreamer.cmake | |||
| @@ -10,6 +10,8 @@ include(Prebuilt) | |||
| 10 | if (WINDOWS) | 10 | if (WINDOWS) |
| 11 | 11 | ||
| 12 | use_prebuilt_binary(libxml) | 12 | use_prebuilt_binary(libxml) |
| 13 | use_prebuilt_binary(iconv) | ||
| 14 | use_prebuilt_binary(gstreamer-plugins) | ||
| 13 | set(GSTREAMER_FOUND ON FORCE BOOL) | 15 | set(GSTREAMER_FOUND ON FORCE BOOL) |
| 14 | set(GSTREAMER_INCLUDE_DIRS | 16 | set(GSTREAMER_INCLUDE_DIRS |
| 15 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib | 17 | ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib |