From 7e45f26a21076f6d577859a1668a08b869ee327e Mon Sep 17 00:00:00 2001
From: Julien Isorce <julien.isorce@gmail.com>
Date: Tue, 17 Apr 2012 18:25:55 +0200
Subject: [PATCH] [494/906] cmake build: use config.h from win32/common and add
 some guidelines

---
 gst-libs/gst/gl/gstglwindow_win32.c  | 5 ++---
 gst-libs/gst/gl/gstglwindow_winCE.c  | 1 -
 gst/gl/CMakeLists.txt                | 5 +++--
 gst/gl/effects/gstgleffectssources.h | 2 +-
 gst/gl/gstglupload.h                 | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/gst-libs/gst/gl/gstglwindow_win32.c b/gst-libs/gst/gl/gstglwindow_win32.c
index 17284d09f4..b841075461 100644
--- a/gst-libs/gst/gl/gstglwindow_win32.c
+++ b/gst-libs/gst/gl/gstglwindow_win32.c
@@ -181,8 +181,8 @@ gst_gl_window_new (DWORD_PTR external_gl_context)
   g_debug ("gl window created: %lud\n", (gulong) priv->internal_win_id);
 
   //device is set in the window_proc
-  if (!priv->display) {
-    g_debug ("failed to create display\n");
+  if (!priv->device) {
+    g_debug ("failed to create device\n");
     goto failure;
   }
 
@@ -191,7 +191,6 @@ gst_gl_window_new (DWORD_PTR external_gl_context)
   return window;
 
 failure:
-  g_mutex_unlock (priv->x_lock);
   g_object_unref (G_OBJECT (window));
   return NULL;
 }
diff --git a/gst-libs/gst/gl/gstglwindow_winCE.c b/gst-libs/gst/gl/gstglwindow_winCE.c
index 67059d8fe4..ecd72e6958 100644
--- a/gst-libs/gst/gl/gstglwindow_winCE.c
+++ b/gst-libs/gst/gl/gstglwindow_winCE.c
@@ -195,7 +195,6 @@ gst_gl_window_new (gulong external_gl_context)
   return window;
 
 failure:
-  g_mutex_unlock (priv->x_lock);
   g_object_unref (G_OBJECT (window));
   return NULL;
 }
diff --git a/gst/gl/CMakeLists.txt b/gst/gl/CMakeLists.txt
index c944ea616f..37ed573078 100755
--- a/gst/gl/CMakeLists.txt
+++ b/gst/gl/CMakeLists.txt
@@ -8,7 +8,6 @@ include_directories(AFTER
   ../../gst-libs/gst/gl
   ${GLEW_INCLUDE_DIR}
   ../../gst-libs
-  ../..
   .
   effects)
 
@@ -19,7 +18,9 @@ include_directories(AFTER
 endif (NOT GST_USING_BINARY_REGISTRY)
 
 if (WIN32)
-  include_directories(AFTER ../../win32/common)
+  include_directories(AFTER
+    ../../win32/common
+    ../../../win32/common)
 endif (WIN32)
 
 add_library (gstopengl MODULE
diff --git a/gst/gl/effects/gstgleffectssources.h b/gst/gl/effects/gstgleffectssources.h
index 5e0081acd5..89158bcd70 100644
--- a/gst/gl/effects/gstgleffectssources.h
+++ b/gst/gl/effects/gstgleffectssources.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * GStreamer
  * Copyright (C) 2008 Filippo Argiolas <filippo.argiolas@gmail.com>
  *
diff --git a/gst/gl/gstglupload.h b/gst/gl/gstglupload.h
index 73293a0500..53cc283bd9 100644
--- a/gst/gl/gstglupload.h
+++ b/gst/gl/gstglupload.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * GStreamer
  * Copyright (C) 2008 Julien Isorce <julien.isorce@gmail.com>
  *