2007-10-15 Tomas Frydrych <tf@o-hand.com>

	* clutter/cogl/gl/cogl-defines.h:
	* clutter/cogl/gl/cogl.c:
	Fixed up GL include for windows.

diff --git a/ChangeLog b/ChangeLog
index b15e4e5..464a1a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-15  Tomas Frydrych  <tf@o-hand.com>
+
+       * clutter/cogl/gl/cogl-defines.h:
+       * clutter/cogl/gl/cogl.c:
+       Fixup GL include for windows.
+
 2007-10-15  Matthew Allum  <mallum@openedhand.com>
 
        * clutter/clutter-actor.c:

diff --git a/clutter/cogl/gl/cogl-defines.h b/clutter/cogl/gl/cogl-defines.h
index 0dec9f4..e5e8ba4 100644 (file)
--- a/clutter/cogl/gl/cogl-defines.h
+++ b/clutter/cogl/gl/cogl-defines.h
@@ -26,7 +26,12 @@
 #ifndef __COGL_DEFINES_H__
 #define __COGL_DEFINES_H__
 
+#ifdef WIN32
+#include <windows.h>
+#include <GL/Glee.h>
+#else
 #include <GL/gl.h>
+#endif
 
 G_BEGIN_DECLS
 

diff --git a/clutter/cogl/gl/cogl.c b/clutter/cogl/gl/cogl.c
index ce89bb2..6d2876a 100644 (file)
--- a/clutter/cogl/gl/cogl.c
+++ b/clutter/cogl/gl/cogl.c
@@ -29,7 +29,12 @@
 
 #include "cogl.h"
 
+#ifdef WIN32
+#include <windows.h>
+#include <GL/Glee.h>
+#else
 #include <GL/gl.h>
+#endif
 #include <string.h>
 
 #ifdef HAVE_CLUTTER_GLX