Skip to content

W
wine-winehq
Commit 7be462dd authored by Lionel Ulmer's avatar Lionel Ulmer Committed by Alexandre Julliard
Browse files
Options

- (ugly) fix for the 'Xmd.h' problem

- fix the detection of DGA 2 in configure script
parent 74341020
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
configure.in
View file @ 7be462dd
...@@ -153,7 +153,9 @@ then ...@@ -153,7 +153,9 @@ then
AC_CHECK_HEADERS(X11/Xlib.h X11/extensions/xf86dga.h) AC_CHECK_HEADERS(X11/Xlib.h X11/extensions/xf86dga.h)
if test "$ac_cv_header_X11_Xlib_h" = "yes" -a "$ac_cv_header_X11_extensions_xf86dga_h" = "yes" if test "$ac_cv_header_X11_Xlib_h" = "yes" -a "$ac_cv_header_X11_extensions_xf86dga_h" = "yes"
then then
AC_CHECK_LIB(Xxf86dga,XDGAQueryExtension,AC_DEFINE(HAVE_LIBXXF86DGA2) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga",,$X_LIBS -lXext -lX11 $X_EXTRA_LIBS) AC_CHECK_LIB(Xxf86dga,
XDGAQueryExtension,
AC_DEFINE(HAVE_LIBXXF86DGA2) AC_DEFINE(HAVE_LIBXXF86DGA) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga",,$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
if test "$ac_cv_lib_Xxf86dga_XDGAQueryExtension" = "no" if test "$ac_cv_lib_Xxf86dga_XDGAQueryExtension" = "no"
then then
AC_CHECK_LIB(Xxf86dga,XF86DGAQueryExtension,AC_DEFINE(HAVE_LIBXXF86DGA) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga",,$X_LIBS -lXext -lX11 $X_EXTRA_LIBS) AC_CHECK_LIB(Xxf86dga,XF86DGAQueryExtension,AC_DEFINE(HAVE_LIBXXF86DGA) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga",,$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
......
include/wine_gl.h
View file @ 7be462dd
...@@ -17,8 +17,10 @@ ...@@ -17,8 +17,10 @@
#undef CALLBACK #undef CALLBACK
#undef WINAPI #undef WINAPI
#define XMD_H /* This is to prevent the Xmd.h inclusion bug to happen :-/ */
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glx.h> #include <GL/glx.h>
#undef XMD_H
#undef APIENTRY #undef APIENTRY
#undef CALLBACK #undef CALLBACK
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment