[Cogl] Fix the pre-defined cogl-defines.h's (for Cogl master)

[Fan Chun-wei]

Hello Neil,

I have made another patch to update the predefined cogl-defines.h's for 
the master branch, which presumely is for Cogl-2.0.  I have pasted by 
previous patch in Thunderbird, so that might have changed to formatting 
of the patch in the process-sorry about that, so I have sent the patch 
as an attachment, which should avoid the issue you mentioned.

Oh, by the way, I did not update cogl.symbols for master as that patch 
did not apply for it, and I thought it might be a better idea to go and 
update that when we get unstable releases from that branch, as APIs come 
and go there-just a few of my thoughts there.

For the patch to build introspection files for Cogl, I am aware that it 
contains Visual Studio project files with that, but just wondering 
whether the other parts of the patch seem ok to you (or the people here)?

Thank you for the time.  with blessings.
-------------- next part --------------
From 7e95bac9ab01c652852f653d3ff4d88cf47ae300 Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei at src.gnome.org>
Date: Fri, 1 Mar 2013 15:54:34 +0800
Subject: [PATCH 3/5] Fix the pre-defined cogl-defines.h

...for the Visual Studio builds of cogl-1.14, so that:
-They can reflect the ones given in the autotools builds more accurately
-The will "#define COGL_HAS_GTYPE_SUPPORT 1", as currently all Visual
 Studio builds are linked to an existing installation of GLib
-They will have the correct versioning info
---
 cogl/cogl-defines.h.win32.in     |   15 +++++----------
 cogl/cogl-defines.h.win32_SDL.in |   15 +++++----------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/cogl/cogl-defines.h.win32.in b/cogl/cogl-defines.h.win32.in
index da9cc5f..2ee5d89 100644
--- a/cogl/cogl-defines.h.win32.in
+++ b/cogl/cogl-defines.h.win32.in
@@ -28,11 +28,8 @@
 #ifndef __COGL_DEFINES_H__
 #define __COGL_DEFINES_H__
 
-#include <glib.h>
-
-G_BEGIN_DECLS
-
 #define COGL_HAS_GLIB_SUPPORT 1
+#define COGL_HAS_GTYPE_SUPPORT 1
 #define COGL_HAS_WGL_SUPPORT 1
 #define COGL_HAS_WIN32_SUPPORT 1
 #define COGL_HAS_GL 1
@@ -60,11 +57,9 @@ G_BEGIN_DECLS
 #define COGL_SYSDEF_POLLHUP 16
 #define COGL_SYSDEF_POLLNVAL 32
 
-#define COGL_VERSION_MAJOR_INTERNAL @COGL_MAJOR_VERSION@
-#define COGL_VERSION_MINOR_INTERNAL @COGL_MINOR_VERSION@
-#define COGL_VERSION_MICRO_INTERNAL @COGL_MICRO_VERSION@
-#define COGL_VERSION_STRING_INTERNAL "@COGL_VERSION@"
-
-G_END_DECLS
+#define COGL_VERSION_MAJOR_INTERNAL 1
+#define COGL_VERSION_MINOR_INTERNAL @COGL_1_MINOR_VERSION@
+#define COGL_VERSION_MICRO_INTERNAL @COGL_1_MICRO_VERSION@
+#define COGL_VERSION_STRING_INTERNAL "@COGL_1_VERSION@"
 
 #endif
diff --git a/cogl/cogl-defines.h.win32_SDL.in b/cogl/cogl-defines.h.win32_SDL.in
index dc9ea5d..7e8e2a2 100644
--- a/cogl/cogl-defines.h.win32_SDL.in
+++ b/cogl/cogl-defines.h.win32_SDL.in
@@ -28,11 +28,8 @@
 #ifndef __COGL_DEFINES_H__
 #define __COGL_DEFINES_H__
 
-#include <glib.h>
-
-G_BEGIN_DECLS
-
 #define COGL_HAS_GLIB_SUPPORT 1
+#define COGL_HAS_GTYPE_SUPPORT 1
 #define COGL_HAS_WGL_SUPPORT 1
 #define COGL_HAS_WIN32_SUPPORT 1
 #define COGL_HAS_SDL_SUPPORT 1
@@ -61,11 +58,9 @@ G_BEGIN_DECLS
 #define COGL_SYSDEF_POLLHUP 16
 #define COGL_SYSDEF_POLLNVAL 32
 
-#define COGL_VERSION_MAJOR_INTERNAL @COGL_MAJOR_VERSION@
-#define COGL_VERSION_MINOR_INTERNAL @COGL_MINOR_VERSION@
-#define COGL_VERSION_MICRO_INTERNAL @COGL_MICRO_VERSION@
-#define COGL_VERSION_STRING_INTERNAL "@COGL_VERSION@"
-
-G_END_DECLS
+#define COGL_VERSION_MAJOR_INTERNAL 1
+#define COGL_VERSION_MINOR_INTERNAL @COGL_1_MINOR_VERSION@
+#define COGL_VERSION_MICRO_INTERNAL @COGL_1_MICRO_VERSION@
+#define COGL_VERSION_STRING_INTERNAL "@COGL_1_VERSION@"
 
 #endif
-- 
1.7.7.1.msysgit.0