[Scummvm-git-logs] scummvm master -> 0aef08a2f34034463b3016fac77b835a504e3133

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0aef08a2f3 CONFIGURE: Attempt to fix Android linking stage


Commit: 0aef08a2f34034463b3016fac77b835a504e3133
    https://github.com/scummvm/scummvm/commit/0aef08a2f34034463b3016fac77b835a504e3133
Author: Paweł Kołodziejski (aquadran at users.sourceforge.net)
Date: 2020-10-14T22:23:54+02:00

Commit Message:
CONFIGURE: Attempt to fix Android linking stage

Changed paths:
    configure


diff --git a/configure b/configure
index 18cfa0607f..086657368f 100755
--- a/configure
+++ b/configure
@@ -5425,8 +5425,8 @@ EOF
 			if cc_check_no_clean $DEFINES $OPENGL_CFLAGS $OPENGL_LIBS $lib
 				then
 				_opengl_game_es2=yes
-				append_var OPENGL_LIBS "$lib"
-				append_var LIBS_3D "$OPENGL_LIBS"
+				append_var LIBS "$lib"
+				append_var LIBS_3D "$lib"
 				break
 			fi
 		done
@@ -5449,8 +5449,8 @@ EOF
 	fi
 
 	if test "$_opengl_game" = yes ; then
-		append_var LIBS "$OPENGL_LIBS"
 		append_var INCLUDES "$OPENGL_CFLAGS"
+		append_var LIBS "$OPENGL_LIBS"
 		append_var LIBS_3D "$OPENGL_LIBS"
 		_opengl_game_classic=yes
 		if test "$_opengl_game_shaders" = auto; then