From 356e134ffb710eedc9404a7c9fa7629d11d68dbe Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 10 Feb 2012 11:05:23 +0800 Subject: [PATCH] Win32: Update predefined cogl-defines.h's -Add a define for COGL_HAS_GLIB_SUPPORT, the Visual C++ projects will build GLib support for COGL for all builds at this time, unless there is a significant call for the need of a COGL Visual C++ build with no dependency on GLib -Pre-define COGL_SYSDEF_POLL* as listed in the default values in commit 74974752 since Windows does not have poll.h and thus does not have special values for these. https://bugzilla.gnome.org/show_bug.cgi?id=669785 Reviewed-by: Neil Roberts --- cogl/cogl-defines.h.win32 | 8 ++++++++ cogl/cogl-defines.h.win32_SDL | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/cogl/cogl-defines.h.win32 b/cogl/cogl-defines.h.win32 index bd059501c..75a70bacd 100644 --- a/cogl/cogl-defines.h.win32 +++ b/cogl/cogl-defines.h.win32 @@ -35,6 +35,7 @@ G_BEGIN_DECLS +#define COGL_HAS_GLIB_SUPPORT 1 #define COGL_HAS_WGL_SUPPORT 1 #define COGL_HAS_WIN32_SUPPORT 1 #define COGL_HAS_GL 1 @@ -55,6 +56,13 @@ G_BEGIN_DECLS #define GLeglImageOES void * #endif +#define COGL_SYSDEF_POLLIN 1 +#define COGL_SYSDEF_POLLPRI 2 +#define COGL_SYSDEF_POLLOUT 4 +#define COGL_SYSDEF_POLLERR 8 +#define COGL_SYSDEF_POLLHUP 16 +#define COGL_SYSDEF_POLLNVAL 32 + G_END_DECLS #endif diff --git a/cogl/cogl-defines.h.win32_SDL b/cogl/cogl-defines.h.win32_SDL index 2ec279c41..5141857a9 100644 --- a/cogl/cogl-defines.h.win32_SDL +++ b/cogl/cogl-defines.h.win32_SDL @@ -35,6 +35,7 @@ G_BEGIN_DECLS +#define COGL_HAS_GLIB_SUPPORT 1 #define COGL_HAS_WGL_SUPPORT 1 #define COGL_HAS_WIN32_SUPPORT 1 #define COGL_HAS_SDL_SUPPORT 1 @@ -56,6 +57,13 @@ G_BEGIN_DECLS #define GLeglImageOES void * #endif +#define COGL_SYSDEF_POLLIN 1 +#define COGL_SYSDEF_POLLPRI 2 +#define COGL_SYSDEF_POLLOUT 4 +#define COGL_SYSDEF_POLLERR 8 +#define COGL_SYSDEF_POLLHUP 16 +#define COGL_SYSDEF_POLLNVAL 32 + G_END_DECLS #endif