Update configure script to force OpenGL support for now

This commit is contained in:
Matt Borgerson 2018-06-26 14:49:19 -07:00
parent ae19795682
commit 3a7b349756
1 changed files with 18 additions and 2 deletions

20
configure vendored
View File

@ -848,7 +848,7 @@ if test "$mingw32" = "yes" ; then
QEMU_CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 $QEMU_CFLAGS"
# MinGW needs -mthreads for TLS and macro _MT.
QEMU_CFLAGS="-mthreads $QEMU_CFLAGS"
LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS"
LIBS="-lwinmm -lws2_32 -liphlpapi -lopengl32 -lglew32 -lgdi32 $LIBS"
write_c_skeleton;
if compile_prog "" "-liberty" ; then
LIBS="-liberty $LIBS"
@ -2945,6 +2945,22 @@ EOF
fi
fi
# Xbox hack to include ogl framework
if test "$darwin" = "yes" ; then
sdl_libs="$sdl_libs -framework OpenGL"
# cat > $TMPC << EOF
# #include <OpenGL/gl.h>
# #include <OpenGL/CGLTypes.h>
# #include <OpenGL/CGLCurrent.h>
# int main(void) { return GL_VERSION != 0; }
# EOF
fi
if test "$linux" = "yes" ; then
sdl_libs="$sdl_libs -lGLEW -lGLU -lGL"
fi
##########################################
# RDMA needs OpenFabrics libraries
if test "$rdma" != "no" ; then
@ -3368,7 +3384,7 @@ if test "$mingw32" = yes; then
else
glib_req_ver=2.22
fi
glib_modules=gthread-2.0
glib_modules="gthread-2.0 gobject-2.0"
if test "$modules" = yes; then
glib_modules="$glib_modules gmodule-export-2.0"
fi