Skip to content

Commit 58c33ad

Browse files
committed
android-configure.sh: Fix GLES auto-detection.
If android-configure.sh didn't find GL emulation headers and libraries, it would complain but fail to disable it for the current build. This patch fixes this.
1 parent 3d62109 commit 58c33ad

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

android-configure.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ if [ "$OPTION_MINGW" = "yes" ] ; then
599599
echo "HOST_OS := windows" >> $config_mk
600600
fi
601601

602-
if [ "$GLES_INCLUDE" -a "$GLES_LIBS" ]; then
602+
if [ "$GLES_SUPPORT" = "yes" -a "$GLES_INCLUDE" -a "$GLES_LIBS" ]; then
603603
echo "QEMU_OPENGLES_INCLUDE := $GLES_INCLUDE" >> $config_mk
604604
echo "QEMU_OPENGLES_LIBS := $GLES_LIBS" >> $config_mk
605605
fi
@@ -725,7 +725,7 @@ fi
725725

726726
echo "#define CONFIG_ANDROID 1" >> $config_h
727727

728-
if [ "$GLES_INCLUDE" -a "$GLES_LIBS" ]; then
728+
if [ "$GLES_SUPPORT" = "yes" ]; then
729729
echo "#define CONFIG_ANDROID_OPENGLES 1" >> $config_h
730730
fi
731731

0 commit comments

Comments
 (0)