diff options
| author | Matthew Waters <ystreet00@gmail.com> | 2013-01-16 15:21:44 +1100 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2013-06-29 10:06:41 +0200 |
| commit | b88081febb67160fbb5c1344931198529a45234e (patch) | |
| tree | e62ff944f6c5b9fd2cee7c21c193ec856515d230 /configure.ac | |
| parent | 02c93bf4aba5361a76b7033f7adbc4b6b0836ff7 (diff) | |
remove dependecy on glew
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index 3e45445..50f3918 100644 --- a/configure.ac +++ b/configure.ac @@ -245,7 +245,6 @@ HAVE_GL=no HAVE_GLES2=no HAVE_EGL=no HAVE_GLU=no -HAVE_GLEW=no HAVE_GNUSTEP_COCOA=no HAVE_WAYLAND_EGL=no @@ -254,15 +253,12 @@ case $host in LIBS="$LIBS -lgdi32" AG_GST_CHECK_LIBHEADER(GL, opengl32, glTexImage2D,, GL/gl.h) AG_GST_CHECK_LIBHEADER(GLU, glu32, gluSphere,, GL/glu.h) - AG_GST_CHECK_LIBHEADER(GLEW, glew32, glewInit,, GL/glew.h) HAVE_GL=yes HAVE_GLU=yes - HAVE_GLEW=yes ;; *) AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h) AG_GST_CHECK_LIBHEADER(GLU, GLU, gluSphere,, GL/glu.h) - AG_GST_CHECK_LIBHEADER(GLEW, GLEW, glewInit,, GL/glew.h) AG_GST_CHECK_LIBHEADER(EGL, EGL, eglGetError,, EGL/egl.h) AG_GST_CHECK_LIBHEADER(GLES2, GLESv2, glTexImage2D,, GLES2/gl2.h) PKG_CHECK_MODULES(WAYLAND_EGL, wayland-client >= 1.0 wayland-cursor >= 1.0 wayland-egl >= 9.0, HAVE_WAYLAND_EGL=yes, HAVE_WAYLAND_EGL=no) @@ -303,7 +299,6 @@ LIBS="$save_LIBS" AC_SUBST(HAVE_GL) AC_SUBST(HAVE_GLU) -AC_SUBST(HAVE_GLEW) AC_SUBST(HAVE_EGL) AC_SUBST(HAVE_GLES2) @@ -365,24 +360,16 @@ else AC_MSG_WARN([GLU is required with OpenGL support]) fi else dnl HAVE_GLU=yes - if test "x$HAVE_GLEW" = "xno"; then - if test "x$NEED_GL" = "xyes"; then - AC_MSG_ERROR([GLEW is required with OpenGL support]) - else - AC_MSG_WARN([GLEW is required with OpenGL support]) - fi - else dnl HAVE_GLEW=yes - USE_OPENGL=yes - if test "x$NEED_GLX" != "xno"; then - USE_GLX=yes - fi + USE_OPENGL=yes + if test "x$NEED_GLX" != "xno"; then + USE_GLX=yes fi fi fi fi fi -#dnl Check for OpenGL, GLU and GLEW +#dnl Check for OpenGL, GLU echo host is $host case $host in *-linux* | *-cygwin* | *-solaris* | *-netbsd* | *-freebsd* | *-openbsd* | *-kfreebsd* | *-dragonflybsd* | *-gnu* ) @@ -399,7 +386,7 @@ case $host in dnl check Desktop OpenGL if test "x$HAVE_GL" = "xyes"; then if test "x$NEED_GL" != "xno"; then - GL_LIBS="$GL_LIBS -lGL -lGLU -lGLEW" + GL_LIBS="$GL_LIBS -lGL -lGLU" fi fi @@ -469,10 +456,6 @@ case $host in AC_MSG_ERROR([OpenGL|ES 2.0 is not supported on your platform yet]) fi - if test "x$HAVE_GLEW" = "xno"; then - AC_MSG_ERROR([GLEW is required]) - fi - GL_LIBS="$LIBS -framework OpenGL -framework Cocoa" GL_CFLAGS="$GL_CFLAGS -framework OpenGL" USE_COCOA=yes @@ -487,7 +470,7 @@ case $host in AC_MSG_ERROR([OpenGL|ES 2.0 is not supported on your platform yet]) fi - GL_LIBS="$GL_LIBS -lgdi32 -lopengl32 -lglu32 -lglew32" + GL_LIBS="$GL_LIBS -lgdi32 -lopengl32 -lglu32" HAVE_WINDOW_WIN32=yes USE_OPENGL=yes USE_WGL=yes |