thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BUILD: Store the Windows installer scripts in a single directory, and share the graphics files.

Browse source
This commit is contained in:
Travis Howell 2011-06-30 11:45:57 +10:00
parent d8b3fe5887
commit 13edea3e83
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dists/win32/ScummVM.iss
View file

@ -14,9 +14,10 @@ DisableStartupPrompt=true
AppendDefaultDirName=false AppendDefaultDirName=false
SolidCompression=true SolidCompression=true
DirExistsWarning=no DirExistsWarning=no
SetupIconFile=scummvm.ico SetupIconFile=graphics\scummvm-install.ico
ShowLanguageDialog=yes ShowLanguageDialog=yes
LanguageDetectionMethod=uilanguage LanguageDetectionMethod=uilanguage
WizardImageFile=graphics\left.bmp
[Languages] [Languages]
Name: en; MessagesFile: compiler:Default.isl Name: en; MessagesFile: compiler:Default.isl

6
ports.mk
View file

@ -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) # Special target to create a win32 snapshot binary (for Inno Setup)
win32dist: $(EXECUTABLE) win32dist: $(EXECUTABLE)
mkdir -p $(WIN32PATH) mkdir -p $(WIN32PATH)
mkdir -p $(WIN32PATH)/graphics
$(STRIP) $(EXECUTABLE) -o $(WIN32PATH)/$(EXECUTABLE) $(STRIP) $(EXECUTABLE) -o $(WIN32PATH)/$(EXECUTABLE)
cp $(DIST_FILES_THEMES) $(WIN32PATH) cp $(DIST_FILES_THEMES) $(WIN32PATH)
ifdef DIST_FILES_ENGINEDATA ifdef DIST_FILES_ENGINEDATA
@ -178,7 +179,8 @@ endif
cp $(srcdir)/README $(WIN32PATH)/README.txt cp $(srcdir)/README $(WIN32PATH)/README.txt
cp /usr/local/README-SDL.txt $(WIN32PATH) cp /usr/local/README-SDL.txt $(WIN32PATH)
cp /usr/local/bin/SDL.dll $(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) cp $(srcdir)/dists/win32/ScummVM.iss $(WIN32PATH)
unix2dos $(WIN32PATH)/*.txt unix2dos $(WIN32PATH)/*.txt
@ -199,7 +201,7 @@ ifdef DIST_FILES_ENGINEDATA
cp $(DIST_FILES_ENGINEDATA) $(srcdir)/$(WIN32BUILD) cp $(DIST_FILES_ENGINEDATA) $(srcdir)/$(WIN32BUILD)
endif endif
cp /usr/local/bin/SDL.dll $(srcdir)/$(WIN32BUILD) 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 # AmigaOS specific