2008-03-25 Neil Roberts <neil@o-hand.com>

Added a native Win32 WGL backend.

	* configure.ac: Added the 'win32' flavour.

	* clutter/cogl/gl/cogl.c (cogl_get_proc_address): Added an ifdef
	to use wglGetProcAddress with the Win32 backend.

	* clutter/Makefile.am (DIST_SUBDIRS): Added the win32 directory.

	* clutter/win32/clutter-win32.pc.in:
	* clutter/win32/clutter-win32.h: 
	* clutter/win32/clutter-stage-win32.h: 
	* clutter/win32/clutter-stage-win32.c: 
	* clutter/win32/clutter-event-win32.c: 
	* clutter/win32/clutter-backend-win32.h: 
	* clutter/win32/Makefile.am:
	* clutter/win32/clutter-backend-win32.c: New files.
This commit is contained in:
Neil Roberts 2008-03-25 15:42:50 +00:00
parent 0264205ad1
commit f9039e53cb

View File

@ -109,7 +109,7 @@ cogl_get_proc_address (const gchar* name)
/* Sucks to ifdef here but not other option..? would be nice to /* Sucks to ifdef here but not other option..? would be nice to
* split the code up for more reuse (once more backends use this * split the code up for more reuse (once more backends use this
*/ */
#ifdef HAVE_CLUTTER_GLX #if defined(HAVE_CLUTTER_GLX)
static GLXGetProcAddressProc get_proc_func = NULL; static GLXGetProcAddressProc get_proc_func = NULL;
static void *dlhand = NULL; static void *dlhand = NULL;
@ -142,7 +142,11 @@ cogl_get_proc_address (const gchar* name)
if (get_proc_func) if (get_proc_func)
return get_proc_func ((unsigned char*) name); return get_proc_func ((unsigned char*) name);
#else /* !HAVE_CLUTTER_GLX */ #elif defined(HAVE_CLUTTER_WIN32)
return (CoglFuncPtr) wglGetProcAddress ((LPCSTR) name);
#else /* HAVE_CLUTTER_WIN32 */
/* this should find the right function if the program is linked against a /* this should find the right function if the program is linked against a
* library providing it */ * library providing it */
@ -158,7 +162,7 @@ cogl_get_proc_address (const gchar* name)
return symbol; return symbol;
} }
#endif /* HAVE_CLUTTER_GLX */ #endif /* HAVE_CLUTTER_WIN32 */
return NULL; return NULL;
} }