brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win32: Minor build fixes for building for win32

Browse Source 
This fixes some minor errors and warnings that were preventing Cogl
building with mingw32:

• cogl-framebuffer-gl.c was not including cogl-texture-private.h.
  Presumably something else ends up including that when building for
  GLX.

• The WGL winsys was not including cogl-error-private.h

• A call to strsplit in the WGL winsys was wrong.

• For some reason the test-wrap-rectangle-textures test was trying to
  include the GDKPixbuf header.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit 5380343399f834d9f96ca3b137d49c9c2193900a)
This commit is contained in:
Neil Roberts 2013-02-21 15:10:15 +00:00
parent 1871045b45
commit fc86d0e12e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cogl/driver/gl/cogl-framebuffer-gl.c
View File

@ -33,6 +33,7 @@
#include "cogl-buffer-gl-private.h" #include "cogl-buffer-gl-private.h"
#include "cogl-error-private.h" #include "cogl-error-private.h"
#include "cogl-texture-gl-private.h" #include "cogl-texture-gl-private.h"
#include "cogl-texture-private.h"
#include <glib.h> #include <glib.h>
#include <string.h> #include <string.h>

12
cogl/winsys/cogl-winsys-wgl.c
View File

@ -45,6 +45,7 @@
#include "cogl-feature-private.h" #include "cogl-feature-private.h"
#include "cogl-win32-renderer.h" #include "cogl-win32-renderer.h"
#include "cogl-winsys-wgl-private.h" #include "cogl-winsys-wgl-private.h"
#include "cogl-error-private.h"
typedef struct _CoglRendererWgl typedef struct _CoglRendererWgl
{ {
@ -416,8 +417,8 @@ create_window_class (CoglDisplay *display, CoglError **error)
if (wgl_display->window_class == 0) if (wgl_display->window_class == 0)
{ {
_cogl_set_error (error, COGL_WINSYS_ERROR, _cogl_set_error (error, COGL_WINSYS_ERROR,
COGL_WINSYS_ERROR_CREATE_CONTEXT, COGL_WINSYS_ERROR_CREATE_CONTEXT,
"Unable to register window class"); "Unable to register window class");
return FALSE; return FALSE;
} }
@ -617,7 +618,8 @@ update_winsys_features (CoglContext *context, CoglError **error)
if (wgl_extensions) if (wgl_extensions)
{ {
char **split_extensions = g_strsplit (wgl_extensions); char **split_extensions =
g_strsplit (wgl_extensions, " ", 0 /* max_tokens */);
COGL_NOTE (WINSYS, " WGL Extensions: %s", wgl_extensions); COGL_NOTE (WINSYS, " WGL Extensions: %s", wgl_extensions);
@ -644,9 +646,7 @@ update_winsys_features (CoglContext *context, CoglError **error)
static CoglBool static CoglBool
_cogl_winsys_context_init (CoglContext *context, CoglError **error) _cogl_winsys_context_init (CoglContext *context, CoglError **error)
{ {
CoglContextWgl *wgl_context; context->winsys = g_new0 (CoglContextWgl, 1);
wgl_context = context->winsys = g_new0 (CoglContextWgl, 1);
cogl_win32_renderer_add_filter (context->display->renderer, cogl_win32_renderer_add_filter (context->display->renderer,
win32_event_filter_cb, win32_event_filter_cb,

1
tests/conform/test-wrap-rectangle-textures.c
View File

@ -1,5 +1,4 @@
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <string.h> #include <string.h>