diff options
author | Travis Howell | 2011-06-30 11:45:57 +1000 |
---|---|---|
committer | Travis Howell | 2011-06-30 11:45:57 +1000 |
commit | 13edea3e8305f6937ee1c9b494e168275c64ad1d (patch) | |
tree | 84bad56641638e73af70899889aa9909cdf904c1 | |
parent | d8b3fe58870ced80c9ec5cc30379083c3928cc81 (diff) | |
download | scummvm-rg350-13edea3e8305f6937ee1c9b494e168275c64ad1d.tar.gz scummvm-rg350-13edea3e8305f6937ee1c9b494e168275c64ad1d.tar.bz2 scummvm-rg350-13edea3e8305f6937ee1c9b494e168275c64ad1d.zip |
BUILD: Store the Windows installer scripts in a single directory, and share the graphics files.
-rw-r--r-- | dists/win32/ScummVM.iss | 3 | ||||
-rw-r--r-- | ports.mk | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/dists/win32/ScummVM.iss b/dists/win32/ScummVM.iss index 68a20d0b14..69282ef77c 100644 --- a/dists/win32/ScummVM.iss +++ b/dists/win32/ScummVM.iss @@ -14,9 +14,10 @@ DisableStartupPrompt=true AppendDefaultDirName=false SolidCompression=true DirExistsWarning=no -SetupIconFile=scummvm.ico +SetupIconFile=graphics\scummvm-install.ico ShowLanguageDialog=yes LanguageDetectionMethod=uilanguage +WizardImageFile=graphics\left.bmp [Languages] Name: en; MessagesFile: compiler:Default.isl @@ -165,6 +165,7 @@ scummvmwinres.o: $(srcdir)/icons/scummvm.ico $(DIST_FILES_THEMES) $(DIST_FILES_E # Special target to create a win32 snapshot binary (for Inno Setup) win32dist: $(EXECUTABLE) mkdir -p $(WIN32PATH) + mkdir -p $(WIN32PATH)/graphics $(STRIP) $(EXECUTABLE) -o $(WIN32PATH)/$(EXECUTABLE) cp $(DIST_FILES_THEMES) $(WIN32PATH) ifdef DIST_FILES_ENGINEDATA @@ -178,7 +179,8 @@ endif cp $(srcdir)/README $(WIN32PATH)/README.txt cp /usr/local/README-SDL.txt $(WIN32PATH) cp /usr/local/bin/SDL.dll $(WIN32PATH) - cp $(srcdir)/icons/scummvm.ico $(WIN32PATH) + cp $(srcdir)/dists/win32/graphics/left.bmp $(WIN32PATH)/graphics + cp $(srcdir)/dists/win32/graphics/scummvm-install.ico $(WIN32PATH)/graphics cp $(srcdir)/dists/win32/ScummVM.iss $(WIN32PATH) unix2dos $(WIN32PATH)/*.txt @@ -199,7 +201,7 @@ ifdef DIST_FILES_ENGINEDATA cp $(DIST_FILES_ENGINEDATA) $(srcdir)/$(WIN32BUILD) endif cp /usr/local/bin/SDL.dll $(srcdir)/$(WIN32BUILD) - makensis -V2 -Dtop_srcdir="../.." -Dtext_dir="../../$(WIN32BUILD)" -Dbuild_dir="../../$(WIN32BUILD)" $(srcdir)/dists/nsis/scummvm.nsi + makensis -V2 -Dtop_srcdir="../.." -Dtext_dir="../../$(WIN32BUILD)" -Dbuild_dir="../../$(WIN32BUILD)" $(srcdir)/dists/win32/scummvm.nsi # # AmigaOS specific |