[Scummvm-git-logs] scummvm master -> 7f373b4cfbd5769e1cbc696c2e302de3c568e722

[sev-]

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

Summary:
eb64843a3b CONFIGURE: Some platforms, e.g. Amiga, require SDL to be after SDL_Net. Change accordingly
7f373b4cfb CONFIGURE: AmigaOS requires -lpthread for libcurl


Commit: eb64843a3b73e7af1fb033eb8503d1d8c5e4477b
    https://github.com/scummvm/scummvm/commit/eb64843a3b73e7af1fb033eb8503d1d8c5e4477b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-10T22:43:06+02:00

Commit Message:
CONFIGURE: Some platforms, e.g. Amiga, require SDL to be after SDL_Net. Change accordingly

Changed paths:
    configure



diff --git a/configure b/configure
index 2f4ed0b..1ba85aa 100755
--- a/configure
+++ b/configure
@@ -70,13 +70,23 @@ get_var() {
 }
 
 append_var() {
-    VAR=${1}
-    shift
-    if eval test -z \"\$${VAR}\" ; then
-        eval ${VAR}='$@'
-    else
-        eval ${VAR}=\"\$${VAR} \"'$@'
-    fi
+	VAR=${1}
+	shift
+	if eval test -z \"\$${VAR}\" ; then
+		eval ${VAR}='$@'
+	else
+		eval ${VAR}=\"\$${VAR} \"'$@'
+	fi
+}
+
+prepend_var() {
+	VAR=${1}
+	shift
+	if eval test -z \"\$${VAR}\" ; then
+		eval ${VAR}='$@'
+	else
+		eval ${VAR}='$@' \"\$${VAR} \"
+	fi
 }
 
 # Add an engine: id name build subengines base-games dependencies
@@ -3370,15 +3380,16 @@ case $_backend in
 #include "SDL_net.h"
 int main(int argc, char *argv[]) { SDLNet_Init(); return 0; }
 EOF
-			cc_check $LIBS $INCLUDES $SDL_NET_CFLAGS $SDL_NET_LIBS && _sdlnet=yes
+			cc_check $SDL_NET_LIBS $LIBS $INCLUDES $SDL_NET_CFLAGS && _sdlnet=yes
 		fi
 		if test "$_sdlnet" = yes ; then
-			append_var LIBS "$SDL_NET_LIBS"
+			# Some platforms require SDL to be after SDL_Net, thus we prepend var
+			prepend_var LIBS "$SDL_NET_LIBS"
 			append_var INCLUDES "$SDL_NET_CFLAGS"
 		fi
 		define_in_config_if_yes "$_sdlnet" 'USE_SDL_NET'
 		echo "$_sdlnet"
-		
+
 		;;
 esac
 


Commit: 7f373b4cfbd5769e1cbc696c2e302de3c568e722
    https://github.com/scummvm/scummvm/commit/7f373b4cfbd5769e1cbc696c2e302de3c568e722
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-10T23:08:09+02:00

Commit Message:
CONFIGURE: AmigaOS requires -lpthread for libcurl

Changed paths:
    configure



diff --git a/configure b/configure
index 1ba85aa..36a0af9 100755
--- a/configure
+++ b/configure
@@ -4179,6 +4179,10 @@ if test "$_libcurl" != "no"; then
 		LIBCURL_LIBS=`$_libcurlconfig --libs`
 		LIBCURL_CFLAGS=`$_libcurlconfig --cflags`
 
+		if test "$_host" = "amigaos"; then
+			append_var LIBCURL_LIBS "-lpthread"
+		fi
+
 		if test "$_libcurl" = "auto"; then
 			_libcurl=no