diff options
| author | McCabe Maxsted | 2009-04-17 20:22:41 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-04-17 20:22:41 -0700 |
| commit | 8bc9d12fcc07e888c10cd0746d2a562c09d3a65a (patch) | |
| tree | 145a6baf1e5456ca6e289f879ab6325e46161b0a /linden/indra/cmake/LLMedia.cmake | |
| parent | Fixed merge conflicts (diff) | |
| parent | Don't use LL_ERRS, it makes the viewer abort! (diff) | |
| download | meta-impy-8bc9d12fcc07e888c10cd0746d2a562c09d3a65a.zip meta-impy-8bc9d12fcc07e888c10cd0746d2a562c09d3a65a.tar.gz meta-impy-8bc9d12fcc07e888c10cd0746d2a562c09d3a65a.tar.bz2 meta-impy-8bc9d12fcc07e888c10cd0746d2a562c09d3a65a.tar.xz | |
Merge commit 'jacek/next' into gst-revamp
Diffstat (limited to 'linden/indra/cmake/LLMedia.cmake')
| -rw-r--r-- | linden/indra/cmake/LLMedia.cmake | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/cmake/LLMedia.cmake b/linden/indra/cmake/LLMedia.cmake index b7bf11c..8a36a69 100644 --- a/linden/indra/cmake/LLMedia.cmake +++ b/linden/indra/cmake/LLMedia.cmake | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | # -*- cmake -*- | 1 | # -*- cmake -*- |
| 2 | 2 | ||
| 3 | include(GStreamer) | 3 | include(GStreamer) |
| 4 | include(QuickTime) | ||
| 5 | 4 | ||
| 6 | set(LLMEDIA_INCLUDE_DIRS | 5 | set(LLMEDIA_INCLUDE_DIRS |
| 7 | ${LIBS_OPEN_DIR}/llmedia | 6 | ${LIBS_OPEN_DIR}/llmedia |
| @@ -11,5 +10,4 @@ set(LLMEDIA_LIBRARIES | |||
| 11 | llmedia | 10 | llmedia |
| 12 | ${GSTREAMER_LIBRARIES} | 11 | ${GSTREAMER_LIBRARIES} |
| 13 | ${GSTREAMER_PLUGINS_BASE_LIBRARIES} | 12 | ${GSTREAMER_PLUGINS_BASE_LIBRARIES} |
| 14 | ${QUICKTIME_LIBRARY} | ||
| 15 | ) | 13 | ) |