diff options
| -rw-r--r-- | dists/win32/ScummVM.iss | 7 | ||||
| -rw-r--r-- | ports.mk | 14 |
2 files changed, 15 insertions, 6 deletions
diff --git a/dists/win32/ScummVM.iss b/dists/win32/ScummVM.iss index 4fcc4f7ee4..e85975f108 100644 --- a/dists/win32/ScummVM.iss +++ b/dists/win32/ScummVM.iss @@ -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 |