aboutsummaryrefslogtreecommitdiff
path: root/ports.mk
diff options
context:
space:
mode:
authorColin Snover2017-12-06 11:57:17 -0600
committerLothar Serra Mari2018-08-18 09:28:56 +0200
commit8bf9e620df81954270a7c5bf999a25172b585173 (patch)
treebc38150db28fb87565c0255369edc3b62d8e7325 /ports.mk
parent11e33ba3fc1b65789358485fa50cdbc0cf26aac7 (diff)
downloadscummvm-rg350-8bf9e620df81954270a7c5bf999a25172b585173.tar.gz
scummvm-rg350-8bf9e620df81954270a7c5bf999a25172b585173.tar.bz2
scummvm-rg350-8bf9e620df81954270a7c5bf999a25172b585173.zip
BUILD: Fix Windows packaging target
Diffstat (limited to 'ports.mk')
-rw-r--r--ports.mk14
1 files changed, 11 insertions, 3 deletions
diff --git a/ports.mk b/ports.mk
index 3fbc2d9a1a..5f34031f20 100644
--- a/ports.mk
+++ b/ports.mk
@@ -450,7 +450,7 @@ scummvmwinres.o: $(srcdir)/icons/scummvm.ico $(DIST_FILES_THEMES) $(DIST_FILES_N
$(QUIET_WINDRES)$(WINDRES) -DHAVE_CONFIG_H $(WINDRESFLAGS) $(DEFINES) -I. -I$(srcdir) $(srcdir)/dists/scummvm.rc scummvmwinres.o
# Special target to create a win32 snapshot binary (for Inno Setup)
-win32dist: $(EXECUTABLE)
+win32dist: all
mkdir -p $(WIN32PATH)
mkdir -p $(WIN32PATH)/graphics
mkdir -p $(WIN32PATH)/doc
@@ -481,15 +481,23 @@ win32dist: $(EXECUTABLE)
cp $(srcdir)/doc/de/Schnellstart $(WIN32PATH)/doc/de/Schnellstart.txt
cp $(srcdir)/doc/se/Snabbstart $(WIN32PATH)/doc/se/Snabbstart.txt
cp $(srcdir)/README $(WIN32PATH)/README.txt
+ 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 /usr/local/README-SDL.txt $(WIN32PATH)
- cp /usr/local/bin/SDL2.dll $(WIN32PATH)
+ cp $(WIN32SDLPATH)/SDL2.dll $(WIN32PATH)
cp $(srcdir)/dists/win32/graphics/left.bmp $(WIN32PATH)/graphics
cp $(srcdir)/dists/win32/graphics/scummvm-install.ico $(WIN32PATH)/graphics
cp $(srcdir)/dists/win32/migration.bat $(WIN32PATH)
cp $(srcdir)/dists/win32/migration.txt $(WIN32PATH)
cp $(srcdir)/dists/win32/ScummVM.iss $(WIN32PATH)
+ifdef USE_SDL_NET
+ cp $(WIN32SDLPATH)/SDL2_net.dll $(WIN32PATH)
+ sed -e '/SDL2_net\.dll/ s/^;//' -i $(WIN32PATH)/ScummVM.iss
+endif
+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