From c2696d1910ec63824c1ae7a7429dcc61451e1081 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 10 Feb 2011 08:22:14 -0700
Subject: Make media_plugin_gstreamer010 find all its headers correctly on
 Windows (notes: need to add archives for iconv and gstreamer to install.xml,
 doesn't link yet)

---
 linden/indra/cmake/GStreamer010Plugin.cmake            | 18 +++++++++++++-----
 .../gstreamer010/llmediaimplgstreamertriviallogging.h  |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/linden/indra/cmake/GStreamer010Plugin.cmake b/linden/indra/cmake/GStreamer010Plugin.cmake
index 90ed35c..f3bd9d7 100644
--- a/linden/indra/cmake/GStreamer010Plugin.cmake
+++ b/linden/indra/cmake/GStreamer010Plugin.cmake
@@ -15,11 +15,19 @@ else (STANDALONE)
   use_prebuilt_binary(gstreamer)
   set(GSTREAMER010_FOUND ON FORCE BOOL)
   set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL)
-  set(GSTREAMER010_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/libxml2
-      )
+  if (WINDOWS)
+    set(GSTREAMER010_INCLUDE_DIRS
+		${LIBS_PREBUILT_DIR}/include/gstreamer-0.10
+		${LIBS_PREBUILT_DIR}/include/glib
+		${LIBS_PREBUILT_DIR}/include/libxml2
+		)
+  else (WINDOWS)
+	set(GSTREAMER010_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/libxml2
+		)
+  endif (WINDOWS)
 
 endif (STANDALONE)
 
diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
index bb90aa1..7917232 100755
--- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
@@ -41,7 +41,7 @@
 /////////////////////////////////////////////////////////////////////////
 // Debug/Info/Warning macros.
 #if LL_WINDOWS
-#include <process.h>
+#include <windows.h>
 #define LL_GETPID GetCurrentProcessId
 #else
 #include <sys/types.h>
-- 
cgit v1.1