[Scummvm-git-logs] scummvm master -> d31b843f9fc5ffa958fc3cc9e9f7c3cf43959bea

[orgads]

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:
d31b843f9f MAKEFILE: Add win32dist-mingw target (#2999)


Commit: d31b843f9fc5ffa958fc3cc9e9f7c3cf43959bea
    https://github.com/scummvm/scummvm/commit/d31b843f9fc5ffa958fc3cc9e9f7c3cf43959bea
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-06-20T12:01:09+03:00

Commit Message:
MAKEFILE: Add win32dist-mingw target (#2999)

Installs, and bundles all required dlls in WIN32PATH or DESTDIR.

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 f13de82685..449abd8d92 100644
--- a/backends/platform/sdl/win32/win32.mk
+++ b/backends/platform/sdl/win32/win32.mk
@@ -2,10 +2,11 @@
 # Windows specific
 #
 
+WIN32PATH ?= $(DESTDIR)
+
 # Special target to create a win32 snapshot binary (for Inno Setup)
-win32dist: all
+win32-data: all
 	mkdir -p $(WIN32PATH)
-	mkdir -p $(WIN32PATH)/graphics
 	mkdir -p $(WIN32PATH)/doc
 	mkdir -p $(WIN32PATH)/doc/cz
 	mkdir -p $(WIN32PATH)/doc/da
@@ -45,35 +46,47 @@ else
 	cp $(srcdir)/README.md $(WIN32PATH)/README.txt
 	cp $(srcdir)/doc/de/NEUES.md $(WIN32PATH)/doc/de/NEUES.txt
 endif
-	cp $(WIN32SDLDOCPATH)/README-SDL.txt $(WIN32PATH)/README-SDL.txt
 	cp $(srcdir)/doc/de/LIESMICH $(WIN32PATH)/doc/de/LIESMICH.txt
 	cp $(srcdir)/doc/se/LasMig $(WIN32PATH)/doc/se/LasMig.txt
-	cp $(WIN32SDLPATH)/SDL2.dll $(WIN32PATH)
+	unix2dos $(WIN32PATH)/*.txt
+	unix2dos $(WIN32PATH)/doc/*.txt
+	unix2dos $(WIN32PATH)/doc/cz/*.txt
+	unix2dos $(WIN32PATH)/doc/da/*.txt
+	unix2dos $(WIN32PATH)/doc/de/*.txt
+	unix2dos $(WIN32PATH)/doc/es/*.txt
+	unix2dos $(WIN32PATH)/doc/fr/*.txt
+	unix2dos $(WIN32PATH)/doc/it/*.txt
+	unix2dos $(WIN32PATH)/doc/no-nb/*.txt
+	unix2dos $(WIN32PATH)/doc/se/*.txt
+
+win32dist: win32-data
+	mkdir -p $(WIN32PATH)/graphics
 	cp $(srcdir)/dists/win32/graphics/left.bmp $(WIN32PATH)/graphics
 	cp $(srcdir)/dists/win32/graphics/scummvm-install.ico $(WIN32PATH)/graphics
 	cp $(srcdir)/dists/win32/graphics/scummvm-install.bmp $(WIN32PATH)/graphics
 	cp $(srcdir)/dists/win32/migration.bat $(WIN32PATH)
 	cp $(srcdir)/dists/win32/migration.txt $(WIN32PATH)
 	cp $(srcdir)/dists/win32/ScummVM.iss $(WIN32PATH)
+ifdef WIN32SDLDOCPATH
+	cp $(WIN32SDLDOCPATH)/README-SDL.txt $(WIN32PATH)/README-SDL.txt
+endif
+ifdef WIN32SDLPATH
+	cp $(WIN32SDLPATH)/SDL2.dll $(WIN32PATH)
 ifdef USE_SDL_NET
 	cp $(WIN32SDLPATH)/SDL2_net.dll $(WIN32PATH)
 	sed -e '/SDL2_net\.dll/ s/^;//' -i $(WIN32PATH)/ScummVM.iss
 endif
+endif
+ifdef WIN32SPARKLEPATH
 ifdef USE_SPARKLE
 	cp $(WIN32SPARKLEPATH)/WinSparkle.dll $(WIN32PATH)
 	sed -e '/WinSparkle\.dll/ s/^;//' -i $(WIN32PATH)/ScummVM.iss
 endif
-	unix2dos $(WIN32PATH)/*.txt
-	unix2dos $(WIN32PATH)/doc/*.txt
-	unix2dos $(WIN32PATH)/doc/cz/*.txt
-	unix2dos $(WIN32PATH)/doc/da/*.txt
-	unix2dos $(WIN32PATH)/doc/de/*.txt
-	unix2dos $(WIN32PATH)/doc/es/*.txt
-	unix2dos $(WIN32PATH)/doc/fr/*.txt
-	unix2dos $(WIN32PATH)/doc/it/*.txt
-	unix2dos $(WIN32PATH)/doc/no-nb/*.txt
-	unix2dos $(WIN32PATH)/doc/se/*.txt
+endif
+
+win32dist-mingw: win32-data
+	ldd $(WIN32PATH)/$(EXECUTABLE) | grep -i mingw | cut -d">" -f2 | cut -d" " -f2 | sort -u | xargs -I files cp -vu files $(WIN32PATH)
 
-.PHONY: win32dist
+.PHONY: win32-data win32dist win32dist-mingw
 
 include $(srcdir)/ports.mk
diff --git a/configure b/configure
index 2836dc78b9..2a5ebf04b7 100755
--- a/configure
+++ b/configure
@@ -229,7 +229,6 @@ _as="as"
 _dwp=dwp
 _windres=windres
 _stagingpath="staging"
-_win32path="c:/scummvm"
 _amigaospath="install"
 _morphospath="PROGDIR:"
 _staticlibpath=
@@ -6121,7 +6120,6 @@ DWP := $_dwp
 WINDRES := $_windres
 WINDRESFLAGS := $WINDRESFLAGS
 STAGINGPATH=$_stagingpath
-WIN32PATH=$_win32path
 AMIGAOSPATH=$_amigaospath
 MORPHOSPATH=$_morphospath
 STATICLIBPATH=$_staticlibpath