[cairo-commit] glitz ChangeLog, 1.90, 1.91 Makefile.am, 1.2, 1.3 configure.in, 1.24, 1.25

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/glitz
In directory gabe:/tmp/cvs-serv23477

Modified Files:
	ChangeLog Makefile.am configure.in 
Log Message:
Add WGL backend. Thanks to Vladimir Vukicevic and Tor Lillqvist.

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/glitz/ChangeLog,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- ChangeLog	9 Nov 2005 12:22:04 -0000	1.90
+++ ChangeLog	9 Nov 2005 12:32:24 -0000	1.91
@@ -1,5 +1,7 @@
 2005-11-09  David Reveman  <davidr at novell.com>
 
+	* Add WGL backend. Thanks to Vladimir Vukicevic and Tor Lillqvist.
+
 	* src/agl/glitz_aglint.h: AGL backend updates (Vladimir Vukicevic)
 
 2005-09-02  David Reveman  <davidr at novell.com>

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/glitz/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	3 Nov 2004 22:50:58 -0000	1.2
+++ Makefile.am	9 Nov 2005 12:32:24 -0000	1.3
@@ -1,3 +1,3 @@
 SUBDIRS = . src
 
-EXTRA_DIST = COPYING
\ No newline at end of file
+EXTRA_DIST = COPYING

Index: configure.in
===================================================================
RCS file: /cvs/cairo/glitz/configure.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- configure.in	14 Sep 2005 15:57:16 -0000	1.24
+++ configure.in	9 Nov 2005 12:32:24 -0000	1.25
@@ -101,6 +101,24 @@
 
 dnl ===========================================================================
 
+AC_MSG_CHECKING([for Win32])
+case "$host" in
+  *-*-mingw*)
+    native_win32=yes
+    ;;
+  *)
+    native_win32=no
+    LIBM="-lm"
+    ;;
+esac
+AC_MSG_RESULT([$native_win32])
+
+AM_CONDITIONAL(OS_WIN32, [test $native_win32 = yes])
+
+AC_SUBST(LIBM)
+
+dnl ===========================================================================
+
 AC_ARG_ENABLE(glx,
   AC_HELP_STRING([--disable-glx], [Disable glitz's GLX backend]),
   [use_glx=$enableval], [use_glx=yes])
@@ -235,16 +253,48 @@
 
 dnl ===========================================================================
 
+AC_ARG_ENABLE(wgl,
+  AC_HELP_STRING([--disable-wgl], [Disable glitz's WGL backend]),
+  [use_wgl=$enableval], [use_wgl=yes])
+
+if test "x$use_wgl" = "xyes"; then
+  AC_MSG_CHECKING([for WGL])
+  WGL_LIBS="-lopengl32 -lgdi32"
+  WGL_CFLAGS=""
+
+  save_libs="$LIBS"
+  LIBS="$WGL_LIBS"
+  AC_TRY_LINK([#include <windows.h>], [int main() { wglCreateContext(0); }],
+	[use_wgl=yes], [use_wgl=no])
+  LIBS="$save_libs"
+  AC_MSG_RESULT([$use_wgl])
+fi
+
+if test "x$use_wgl" = "xyes"; then
+  AM_CONDITIONAL(GLITZ_BUILD_WGL_BACKEND, true)
+else
+  AM_CONDITIONAL(GLITZ_BUILD_WGL_BACKEND, false)
+  WGL_LIBS=""
+  WGL_CFLAGS=""
+fi
+
+AC_SUBST(WGL_CFLAGS)
+AC_SUBST(WGL_LIBS)
+
+dnl ===========================================================================
+
 AC_OUTPUT([
 Makefile
 src/Makefile
 src/glx/Makefile
 src/agl/Makefile
 src/egl/Makefile
+src/wgl/Makefile
 src/glitz.pc
 src/glx/glitz-glx.pc
 src/agl/glitz-agl.pc
 src/egl/glitz-egl.pc
+src/wgl/glitz-wgl.pc
 ])
 
 dnl ===========================================================================
@@ -254,4 +304,5 @@
 echo "  GLX: $use_glx"
 echo "  AGL: $use_agl"
 echo "  EGL: $use_egl"
+echo "  WGL: $use_wgl"
 echo ""