Mercurial > mxe-octave
view src/ftgl-1-gl-m4.patch @ 4310:2c34ec679fb3
qt5: update to 5.7.1
* src/qtbase-1-fixes.patch: update patch from mxe.cc
* src/qtbase.mk: update version, checksum, use -no-pch
* src/qtimageformats-1.patch: update patch from mxe.cc
* src/qtimageformats.mk: update checksum
* src/qtsvg.mk: update checksum
* src/qttools.mk: update checksum
author | John D |
---|---|
date | Sun, 01 Jan 2017 08:00:17 -0500 |
parents | 3a42978c7bc6 |
children |
line wrap: on
line source
--- ftgl-2.1.3~rc5/m4/gl.m4 2008-05-05 16:48:57.000000000 +0200 +++ ftgl-2.1.3~rc5/m4/gl.m4.new 2010-09-20 14:55:27.000000000 +0200 @@ -63,6 +63,8 @@ LIBS="-lGL" fi AC_LINK_IFELSE([AC_LANG_CALL([],[glBegin])],[HAVE_GL=yes], [HAVE_GL=no]) +HAVE_GL=yes +LIBS="-lopengl32" if test "x$HAVE_GL" = xno ; then if test "x$GL_X_LIBS" != x ; then LIBS="-lGL $GL_X_LIBS" @@ -105,6 +107,8 @@ AC_MSG_CHECKING([for GLU library]) LIBS="-lGLU $GL_LIBS" AC_LINK_IFELSE([AC_LANG_CALL([],[gluNewTess])],[HAVE_GLU=yes], [HAVE_GLU=no]) +LIBS="-lglu32 $GL_LIBS" +HAVE_GLU=yes if test "x$HAVE_GLU" = xno ; then if test "x$GL_X_LIBS" != x ; then LIBS="-lGLU $GL_LIBS $GL_X_LIBS"