Mercurial > mxe-octave
view src/ftgl-1-gl-m4.patch @ 4734:80461a9e516c
override default xerbla with version from Octave
* mingw-blas-1-xerbla.patch, blas.mk: Build default libxerbla lib.
* mingw-lapack-1-xerbla.patch, lapack.mk: Use external libxerbla.
* mingw-openblas-1-xerbla.patch, openblas.mk: Likewise.
* src/qrupdate-1-fixes.patch: Likewise.
* default-octave.mk: Also install libxerbla.dll as libxerbla-octave.dll.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 21 Jun 2018 01:32:10 -0400 |
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"