[Scummvm-git-logs] scummvm master -> 85c4f53f7fe42c882d34fa5cf75501cfc9f11db8

[orgads]

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:
de77d9b71e CONFIGURE: Fix cross-compilation with mxe mingw
85c4f53f7f BUILD: Support peldd on mingw cross-compiler


Commit: de77d9b71eb17b999ec21888bdcacda53d0bad3e
    https://github.com/scummvm/scummvm/commit/de77d9b71eb17b999ec21888bdcacda53d0bad3e
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-07-30T05:47:22+03:00

Commit Message:
CONFIGURE: Fix cross-compilation with mxe mingw

Changed paths:
    configure


diff --git a/configure b/configure
index 4211b37a21..a4098b418d 100755
--- a/configure
+++ b/configure
@@ -3413,10 +3413,12 @@ if test -n "$_host"; then
 			_zlib=yes
 			;;
 		*mingw32*)
-			_sdlconfig=$_host-sdl-config
+			_sdlconfig=$_host-sdl2-config
+			_libcurlconfig=$_host-curl-config
 			_windres=$_host-windres
 			_ar="$_host-ar cr"
 			_ranlib=$_host-ranlib
+			_strip=$_host-strip
 			;;
 		mips-sgi*)
 			append_var LDFLAGS "-static-libgcc"


Commit: 85c4f53f7fe42c882d34fa5cf75501cfc9f11db8
    https://github.com/scummvm/scummvm/commit/85c4f53f7fe42c882d34fa5cf75501cfc9f11db8
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-07-30T05:47:22+03:00

Commit Message:
BUILD: Support peldd on mingw cross-compiler

Changed paths:
    backends/platform/sdl/win32/win32.mk
    configure


diff --git a/backends/platform/sdl/win32/win32.mk b/backends/platform/sdl/win32/win32.mk
index 449abd8d92..d44749cc3d 100644
--- a/backends/platform/sdl/win32/win32.mk
+++ b/backends/platform/sdl/win32/win32.mk
@@ -85,7 +85,11 @@ endif
 endif
 
 win32dist-mingw: win32-data
+ifneq (,$(findstring peldd,$(LDD)))
+	$(LDD) $(WIN32PATH)/$(EXECUTABLE) | xargs -I files cp -vu files $(WIN32PATH)
+else
 	ldd $(WIN32PATH)/$(EXECUTABLE) | grep -i mingw | cut -d">" -f2 | cut -d" " -f2 | sort -u | xargs -I files cp -vu files $(WIN32PATH)
+endif
 
 .PHONY: win32-data win32dist win32dist-mingw
 
diff --git a/configure b/configure
index a4098b418d..c94db3c466 100755
--- a/configure
+++ b/configure
@@ -230,6 +230,7 @@ _ar="ar cru"
 _as="as"
 _dwp=dwp
 _windres=windres
+_ldd=ldd
 _stagingpath="staging"
 _amigaospath="install"
 _morphospath="PROGDIR:"
@@ -3419,6 +3420,9 @@ if test -n "$_host"; then
 			_ar="$_host-ar cr"
 			_ranlib=$_host-ranlib
 			_strip=$_host-strip
+			if `which $_host-peldd >/dev/null 2>&1`; then
+				_ldd="$_host-peldd -t --ignore-errors"
+			fi
 			;;
 		mips-sgi*)
 			append_var LDFLAGS "-static-libgcc"
@@ -6163,6 +6167,7 @@ AS := $_as
 ASFLAGS := $ASFLAGS
 DWP := $_dwp
 WINDRES := $_windres
+LDD := $_ldd
 WINDRESFLAGS := $WINDRESFLAGS
 STAGINGPATH=$_stagingpath
 AMIGAOSPATH=$_amigaospath