pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes testgles and testgl

Browse source
This commit is contained in:
Gabriel Jacobo 2013-10-09 11:30:01 -03:00
parent 3e171ab36e
commit dca7c7b00d
4 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
test/configure vendored
View file

@ -587,6 +587,7 @@ LIBOBJS
SDL_TTF_LIB
XLIB
GLLIB
GLESLIB
CPP
XMKMF
SDL_CONFIG
@ -3785,7 +3786,7 @@ $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
fi
if test x$have_x = xyes; then
if test x$ac_x_includes = xno || test "x$ac_x_includes" = xNone; then
if test x$ac_x_includes = xno || test "x$ac_x_includes" = xNone || test "x$ac_x_includes" = x; then
:
else
CFLAGS="$CFLAGS -I$ac_x_includes"
@ -3793,10 +3794,11 @@ if test x$have_x = xyes; then
if test x$ac_x_libraries = xno || test "x$ac_x_libraries" = xNone; then
:
else
XPATH="-L$ac_x_libraries"
if test "x$ac_x_libraries" = x; then
XPATH=""
XLIB="-lX11"
else
XPATH="-L$ac_x_libraries"
XLIB="-L$ac_x_libraries -lX11"
fi
fi
@ -3859,14 +3861,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
$as_echo "$have_opengles" >&6; }
GLLIB=""
GLESLIB=""
if test x$have_opengles = xyes; then
CFLAGS="$CFLAGS -DHAVE_OPENGLES"
GLLIB="$XPATH -lGLESv1_CM"
elif test x$have_opengl = xyes; then
GLESLIB="$XPATH -lGLESv1_CM"
fi
if test x$have_opengl = xyes; then
CFLAGS="$CFLAGS -DHAVE_OPENGL"
GLLIB="$XPATH $SYS_GL_LIBS"
else
GLLIB=""
fi