Permalink
Browse files

BUILD: Fix Windows packaging target

  • Loading branch information...
csnover authored and lotharsm committed Dec 6, 2017
1 parent 11e33ba commit 8bf9e620df81954270a7c5bf999a25172b585173
Showing with 15 additions and 6 deletions.
  1. +4 −3 dists/win32/ScummVM.iss
  2. +11 −3 ports.mk
@@ -22,6 +22,7 @@ SetupIconFile=graphics\scummvm-install.ico
WizardImageFile=graphics\left.bmp
ShowLanguageDialog=yes
LanguageDetectionMethod=uilanguage
PrivilegesRequired=lowest

[Languages]
Name: en; MessagesFile: compiler:Default.isl
@@ -111,8 +112,8 @@ Source: doc/se/LasMig.txt; DestDir: {app}; Flags: ignoreversion isreadme; Langua
Source: README-SDL.txt; DestDir: {app}; Flags: ignoreversion
Source: scummvm.exe; DestDir: {app}; Flags: ignoreversion
Source: SDL2.dll; DestDir: {app}; Flags: replacesameversion
;Mirgration script for saved games in Windows NT4 onwards
;Source: SDL2_net.dll; DestDir: {app}; Flags: replacesameversion
;Source: WinSparkle.dll; DestDir: {app}; Flags: replacesameversion
;Migration script for saved games in Windows NT4 onwards
Source: migration.bat; DestDir: {app}; Flags: ignoreversion; MinVersion: 0, 1
Source: migration.txt; DestDir: {app}; Flags: ignoreversion; MinVersion: 0, 1


@@ -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

0 comments on commit 8bf9e62

Please sign in to comment.