commit d6c0f9f7849d7aa36cacc2390a3d025821353ccf
author Alexandre Julliard <julliard@winehq.org> Thu Jan 04 22:44:55 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Jan 04 22:44:55 2001 +0000
tree 8bfaaef029b45fceb862925f99d50f2252300cd8
parent 28b8ac83439b79c4b377a187c6b7bfae03483db6

Authors: Andrew Lewycky <andrew@transgaming.com>, Gavriel State <gav@transgaming.com>, Ove Kaaven <ovek@transgaming.com>
Major DirectDraw restructure/reimplementation, using an improved component
object model hierarchy. The implementation currently supports:
- DirectDraw over GDI/USER in a window (using DIBsections and
  asynchronous updates)
- XVidMode
- XF86DGA2
- All DirectDraw interfaces from versions 1 to 7 (at least in theory)
- Hooks for Direct3D interfaces

configure.in

diff --git a/configure.in b/configure.in
index 7fcd9e8..5108460 100644
--- a/configure.in
+++ b/configure.in
@@ -134,12 +134,6 @@
 OPENGLFILES=""
 AC_SUBST(OPENGL32_DLL)
 OPENGL32_DLL=""
-AC_SUBST(DGA_SRCS)
-DGA_SRCS=""
-AC_SUBST(DGA2_SRCS)
-DGA2_SRCS=""
-AC_SUBST(MESA_SRCS)
-MESA_SRCS=""
 if test "$have_x" = "yes"
 then
     XLIB="-lXext -lX11"
@@ -212,15 +206,12 @@
                   AC_DEFINE(HAVE_LIBXXF86DGA2)
                   AC_DEFINE(HAVE_LIBXXF86DGA)
                   X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga"
-                  DGA_SRCS='$(DGA_SRCS)'
-                  DGA2_SRCS='$(DGA2_SRCS)'
                ],
                 [ dnl *** If not found, look for XF86DGAQueryExtension()
                   dnl *** instead (DGA 2.0 not found)...
                   AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension,
                     [ AC_DEFINE(HAVE_LIBXXF86DGA)
                       X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga"
-                      DGA_SRCS='$(DGA_SRCS)'
                     ],,
                     $X_LIBS -lXext -lX11 $X_EXTRA_LIBS
                   )
@@ -292,7 +283,6 @@
 		dnl Check for the presence of the library
 		AC_CHECK_LIB(GL,glXCreateContext,
 			     X_PRE_LIBS="$X_PRE_LIBS -lGL"
-			     MESA_SRCS='$(MESA_SRCS)'
 			     ,,
 			     $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS)
 
@@ -324,6 +314,20 @@
 
 				OPENGL32_DLL=opengl32
 			fi
+
+                        AC_CHECK_HEADERS(GL/osmesa.h,
+                            [ dnl *** If GL/osmesa.h exists...
+                                AC_CHECK_LIB(GL, OSMesaCreateContext,
+                                  AC_DEFINE(HAVE_OSMESA),
+                                  AC_CHECK_LIB(OSMesa, OSMesaCreateContext,
+                                  [ AC_DEFINE(HAVE_OSMESA)
+                                    X_PRE_LIBS="$X_PRE_LIBS -lOSMesa"
+                                  ]),
+                                  $X_LIBS -lXext -lX11 $X_EXTRA_LIBS
+                                )
+                            ],
+                            AC_MSG_WARN([OSMesa not found!!])
+                        )
 		fi
 	     fi
 	 fi
@@ -1344,7 +1348,7 @@
 if test "$wine_cv_opengl_version_threadsafe" = "yes" -a $OPENGL = "yes"
 then
   echo
-  echo "*** Warning: you explicitely linked in a thread-safe OpenGL version. If you"
+  echo "*** Warning: you explicitly linked in a thread-safe OpenGL version. If you"
   echo "*** experience unusual crashes on DirectDraw games, try first to disable OpenGL"
   echo "*** support before reporting bugs."
 fi