diff options
-rw-r--r-- | ChangeLog.txt | 6 | ||||
-rw-r--r-- | linden/indra/cmake/GStreamer.cmake | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 7bb037f..ff2ac63 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -5,6 +5,12 @@ | |||
5 | modified: linden/indra/cmake/OPENAL.cmake | 5 | modified: linden/indra/cmake/OPENAL.cmake |
6 | 6 | ||
7 | 7 | ||
8 | * Fixed CMake not finding GLib on windows. | ||
9 | |||
10 | modified: linden/indra/cmake/GStreamer.cmake | ||
11 | |||
12 | |||
13 | |||
8 | 2009-06-14 McCabe Maxsted <hakushakukun@gmail.com> | 14 | 2009-06-14 McCabe Maxsted <hakushakukun@gmail.com> |
9 | 15 | ||
10 | * Added IM preference for showing IMs in either main or local chat. | 16 | * Added IM preference for showing IMs in either main or local chat. |
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake index 880233e..29896d0 100644 --- a/linden/indra/cmake/GStreamer.cmake +++ b/linden/indra/cmake/GStreamer.cmake | |||
@@ -11,6 +11,7 @@ if (WINDOWS) | |||
11 | 11 | ||
12 | use_prebuilt_binary(libxml) | 12 | use_prebuilt_binary(libxml) |
13 | use_prebuilt_binary(iconv) | 13 | use_prebuilt_binary(iconv) |
14 | use_prebuilt_binary(glib) | ||
14 | use_prebuilt_binary(gstreamer-plugins) | 15 | use_prebuilt_binary(gstreamer-plugins) |
15 | set(GSTREAMER_FOUND ON FORCE BOOL) | 16 | set(GSTREAMER_FOUND ON FORCE BOOL) |
16 | set(GSTREAMER_INCLUDE_DIRS | 17 | set(GSTREAMER_INCLUDE_DIRS |