diff options
-rw-r--r-- | ChangeLog.txt | 4 | ||||
-rw-r--r-- | linden/indra/cmake/GStreamer.cmake | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 9963112..5802245 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,9 @@ | |||
1 | 2009-03-29 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2009-03-29 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * linden/indra/cmake/GStreamer.cmake: | ||
4 | Tweaked the list of linked-in gstreamer libs for Mac. | ||
5 | |||
6 | |||
3 | * linden/indra/newview/viewer_manifest.py: | 7 | * linden/indra/newview/viewer_manifest.py: |
4 | Removed the "2.0.0" named glib libs. Only using "2.0" now. | 8 | Removed the "2.0.0" named glib libs. Only using "2.0" now. |
5 | 9 | ||
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake index f790e19..c1bbc57 100644 --- a/linden/indra/cmake/GStreamer.cmake +++ b/linden/indra/cmake/GStreamer.cmake | |||
@@ -65,12 +65,15 @@ else (WINDOWS) | |||
65 | if (DARWIN) | 65 | if (DARWIN) |
66 | 66 | ||
67 | set(GSTREAMER_LIBRARIES | 67 | set(GSTREAMER_LIBRARIES |
68 | xml2 | 68 | gstvideo-0.10 |
69 | glib-2.0 | 69 | gstaudio-0.10 |
70 | gstbase-0.10 | ||
71 | gstreamer-0.10 | ||
70 | gobject-2.0 | 72 | gobject-2.0 |
71 | gmodule-2.0 | 73 | gmodule-2.0 |
72 | gthread-2.0 | 74 | gthread-2.0 |
73 | gstreamer-0.10 | 75 | glib-2.0 |
76 | xml2 | ||
74 | ) | 77 | ) |
75 | 78 | ||
76 | else (DARWIN) | 79 | else (DARWIN) |