actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't depend on the linker being smart enough to pull in -lGL. See my e-mail to the dev list for more details.

Browse Source
This commit is contained in:
Steve Checkoway
2004-01-30 05:14:02 +00:00
parent 6e13a833d2
commit bc3e405877
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/autoconf/m4/opengl.m4
+4 -4
View File
@@ -5,7 +5,7 @@ AC_DEFUN(SM_OPENGL,
GL_LIBS=
if test "$enable_mesa" = "yes"; then
AC_CHECK_LIB(MesaGL, glPushMatrix, have_mesagl=yes)
AC_CHECK_LIB(MesaGLU, gluGetString, have_mesaglu=yes)
AC_CHECK_LIB(MesaGLU, gluGetString, have_mesaglu=yes,, -lMesaGL)
if test "$have_mesagl" = "yes" -a "$have_mesaglu" = "yes"; then
GL_LIBS="-lMesaGL -lMesaGLU"
fi
@@ -13,7 +13,7 @@ AC_DEFUN(SM_OPENGL,
if test "$GL_LIBS" = ""; then
AC_CHECK_LIB(GL, glPushMatrix, have_gl=yes)
AC_CHECK_LIB(GLU, gluGetString, have_glu=yes)
AC_CHECK_LIB(GLU, gluGetString, have_glu=yes,, -lGL)
if test "$have_gl" = "yes" -a "$have_glu" = "yes"; then
GL_LIBS="-lGL -lGLU"
fi
@@ -31,7 +31,7 @@ AC_DEFUN(SM_OPENGL,
if test "$enable_mesa" = "yes"; then
AC_CHECK_LIB(MesaGL, glPushMatrix, have_mesagl=yes)
AC_CHECK_LIB(MesaGLU, gluGetString, have_mesaglu=yes)
AC_CHECK_LIB(MesaGLU, gluGetString, have_mesaglu=yes,, -lMesaGL)
if test "$have_mesagl" = "yes" -a "$have_mesaglu" = "yes"; then
GL_LIBS="-lMesaGL -lMesaGLU"
fi
@@ -39,7 +39,7 @@ AC_DEFUN(SM_OPENGL,
if test "$GL_LIBS" = ""; then
AC_CHECK_LIB(GL, glPushMatrix, have_gl=yes)
AC_CHECK_LIB(GLU, gluGetString, have_glu=yes)
AC_CHECK_LIB(GLU, gluGetString, have_glu=yes,, -lGL)
if test "$have_gl" = "yes" -a "$have_glu" = "yes"; then
GL_LIBS="-lGL -lGLU"
fi