1 files changed, 94 insertions, 16 deletions

diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 10d5207..880233e 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -1,33 +1,111 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (STANDALONE)
-  include(FindPkgConfig)
-
-  pkg_check_modules(GSTREAMER REQUIRED gstreamer-0.10)
-  pkg_check_modules(GSTREAMER_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)
-elseif (LINUX)
-  use_prebuilt_binary(gstreamer)
   # possible libxml should have its own .cmake file instead
   use_prebuilt_binary(libxml)
   set(GSTREAMER_FOUND ON FORCE BOOL)
   set(GSTREAMER_PLUGINS_BASE_FOUND ON FORCE BOOL)
+  use_prebuilt_binary(gstreamer)
+
+if (WINDOWS)
+
+  use_prebuilt_binary(libxml)
+  use_prebuilt_binary(iconv)
+  use_prebuilt_binary(gstreamer-plugins)
+  set(GSTREAMER_FOUND ON FORCE BOOL)
   set(GSTREAMER_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gio
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gobject
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/iconv
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gst
       )
-  # We don't need to explicitly link against gstreamer itself, because
-  # LLMediaImplGStreamer probes for the system's copy at runtime.
+
   set(GSTREAMER_LIBRARIES
-      gobject-2.0
+      glib-2.0
+      gio-2.0
       gmodule-2.0
-      dl
+      gobject-2.0
       gthread-2.0
-      rt
-      glib-2.0
+      libgstvideo-0.10
+      libgsttag-0.10
+      libgstsdp-0.10
+      libgstrtsp-0.10
+      libgstrtp-0.10
+      libgstriff-0.10
+      libgstreamer-0.10
+      libgstpbutils-0.10
+      libgstnetbuffer-0.10
+      libgstnet-0.10
+      libgstinterfaces-0.10
+      libgstdshow-0.10
+      libgstdataprotocol-0.10
+      libgstcontroller-0.10
+      libgstbase-0.10
+      libgstaudio-0.10
+      libgstapp-0.10
+      libxml2
+      libxml2_a
+      libxml2_a_dll
+      iconv
+      iconv_a
       )
-endif (STANDALONE)
+
+else (WINDOWS)
+
+  set(GSTREAMER_INCLUDE_DIRS
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0/glib
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0/gobject
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
+      )
+
+  if (DARWIN)
+
+    find_library( XML2_LIB
+      NAMES xml2.2
+      PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
+      NO_DEFAULT_PATH
+      DOC "libxml2 dynamic library / shared object" )
+
+    if (NOT XML2_LIB)
+      message(FATAL_ERROR "libxml2 not found!")
+    else (NOT XML2_LIB)
+      #message(STATUS "libxml2 found: ${XML2_LIB}")
+    endif (NOT XML2_LIB)
+
+    set(GSTREAMER_LIBRARIES
+        gstvideo-0.10
+        gstaudio-0.10
+        gstbase-0.10
+        gstreamer-0.10
+        gobject-2.0
+        gmodule-2.0
+        gthread-2.0
+        glib-2.0
+        ${XML2_LIB}
+        )
+
+  else (DARWIN)
+
+    set(GSTREAMER_LIBRARIES
+        gstvideo-0.10
+        gstaudio-0.10
+        gstbase-0.10
+        gstreamer-0.10
+        gobject-2.0
+        gmodule-2.0
+        dl
+        gthread-2.0
+        rt
+        glib-2.0
+        )
+
+  endif (DARWIN)
+
+endif (WINDOWS)
 
 if (GSTREAMER_FOUND AND GSTREAMER_PLUGINS_BASE_FOUND)
   set(GSTREAMER ON CACHE BOOL "Build with GStreamer streaming media support.")