Mercurial > mxe-octave
view src/ftgl-1-gl-m4.patch @ 3289:b28756fd131c
* src/build-msvctools/cc-msvc.cc: Allow to preprocess-only.
Make sure to run the compiler, and not the linker, when doing only
pre-processing. Required to compile libgpg_error, which pre-processes
a header file.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Thu, 07 Nov 2013 13:15:25 -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"