ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build without opengl, fix #3148357 

Stop linking unconditionally to libGLU because it will
fail at link time if GL headers are not found.
This commit is contained in:
riccardom 2010-12-31 16:42:58 +00:00
parent d23f9f77a9
commit e6ad3b5db5
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desmume/configure.ac
View File

@ -68,7 +68,7 @@ fi
dnl - Check for the OpenGL includes dnl - Check for the OpenGL includes
AC_CHECK_HEADERS([GL/gl.h], AC_CHECK_HEADERS([GL/gl.h],
[AC_CHECK_HEADERS([GL/glu.h], [have_gl_h=yes], [have_gl_h=no])], [AC_CHECK_HEADERS([GL/glu.h], [have_gl_h=yes LIBS="$LIBS -lGLU"], [have_gl_h=no])],
[have_gl_h=no]) [have_gl_h=no])
if test "have_gl_h" = "no" ; then if test "have_gl_h" = "no" ; then
AC_MSG_WARN([Building without GL support because of missing headers.]) AC_MSG_WARN([Building without GL support because of missing headers.])
@ -271,9 +271,6 @@ AC_ARG_ENABLE(wifi,
dnl Set compiler library flags per target. dnl Set compiler library flags per target.
case $target in case $target in
*linux* | *bsd*)
LIBS="$LIBS -lGLU"
;;
*mingw*) *mingw*)
LIBS="$LIBS -ldxguid -ldxerr8 -ldsound -lopengl32 -lws2_32 -mwindows" LIBS="$LIBS -ldxguid -ldxerr8 -ldsound -lopengl32 -lws2_32 -mwindows"
UI_DIR="windows" UI_DIR="windows"