Skip to content

V
vlc
Commit 8c5e52f4 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

configure: fix GL detection on Windows (close #11062)

parent 54560cc8
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 10 deletions
configure.ac
View file @ 8c5e52f4
...@@ -2993,27 +2993,25 @@ PKG_CHECK_MODULES([EGL], [egl], [ ...@@ -2993,27 +2993,25 @@ PKG_CHECK_MODULES([EGL], [egl], [
]) ])
AM_CONDITIONAL([HAVE_EGL], [test "${have_egl}" = "yes"]) AM_CONDITIONAL([HAVE_EGL], [test "${have_egl}" = "yes"])
have_gl="no"
PKG_CHECK_MODULES([GL], [gl], [ PKG_CHECK_MODULES([GL], [gl], [
have_gl="yes" have_gl="yes"
], [ ], [
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
[#include <GL/gl.h>]], [ #ifdef _WIN32
# include <GL/glew.h>
#endif
#include <GL/gl.h>
]], [
[int t0 = GL_TEXTURE0;]]) [int t0 = GL_TEXTURE0;]])
], [ ], [
GL_CFLAGS="" GL_CFLAGS=""
have_gl="yes"
AS_IF([test "${SYS}" != "mingw32"], [ AS_IF([test "${SYS}" != "mingw32"], [
have_gl="yes"
GL_LIBS="-lGL" GL_LIBS="-lGL"
], [ ], [
AC_CHECK_HEADER([GL/glew.h], [
have_gl="yes"
], [
have_gl="no"
])
GL_LIBS="-lopengl32" GL_LIBS="-lopengl32"
]) ])
], [
have_gl="no"
]) ])
]) ])
AM_CONDITIONAL([HAVE_GL], [test "${have_gl}" = "yes"]) AM_CONDITIONAL([HAVE_GL], [test "${have_gl}" = "yes"])
......
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