Fixed OpenGL configure: move HAVE_OPENGL define to where it belongs,
fixed glext.h presence in configure check for PFNGLCOLORTABLEEXTPROC.
This commit is contained in:
parent
a007f3364a
commit
6bb6d4c2ea
|
@ -268,6 +268,7 @@ then
|
||||||
|
|
||||||
|
|
||||||
OPENGLFILES='$(OPENGLFILES)'
|
OPENGLFILES='$(OPENGLFILES)'
|
||||||
|
AC_DEFINE(HAVE_OPENGL)
|
||||||
|
|
||||||
if test $ac_cv_lib_GL_glXCreateContext = "yes"
|
if test $ac_cv_lib_GL_glXCreateContext = "yes"
|
||||||
then
|
then
|
||||||
|
@ -277,7 +278,10 @@ then
|
||||||
then
|
then
|
||||||
AC_CACHE_CHECK("for OpenGL extension functions prototypes", wine_cv_extension_prototypes,
|
AC_CACHE_CHECK("for OpenGL extension functions prototypes", wine_cv_extension_prototypes,
|
||||||
AC_TRY_COMPILE([#include <GL/gl.h>
|
AC_TRY_COMPILE([#include <GL/gl.h>
|
||||||
#include <GL/glext.h>],
|
#ifdef HAVE_GL_GLEXT_H
|
||||||
|
# include <GL/glext.h>
|
||||||
|
#endif
|
||||||
|
],
|
||||||
[PFNGLCOLORTABLEEXTPROC test_proc;],
|
[PFNGLCOLORTABLEEXTPROC test_proc;],
|
||||||
[wine_cv_extension_prototypes="yes"],
|
[wine_cv_extension_prototypes="yes"],
|
||||||
[wine_cv_extension_prototypes="no"]
|
[wine_cv_extension_prototypes="no"]
|
||||||
|
@ -288,7 +292,6 @@ then
|
||||||
AC_DEFINE(HAVE_GLEXT_PROTOTYPES)
|
AC_DEFINE(HAVE_GLEXT_PROTOTYPES)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_DEFINE(HAVE_OPENGL)
|
|
||||||
OPENGL32_DLL=opengl32
|
OPENGL32_DLL=opengl32
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue