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

BUILD: Use separate win32 target for each installer.

Browse source
This commit is contained in:
Travis Howell 2011-06-30 02:14:36 +10:00
parent 3d7252aee8
commit 50f28f2c23
2 changed files with 38 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
configure vendored
View file

@ -174,7 +174,8 @@ _strip=strip
_ar="ar cru"
_as="as"
_windres=windres
_win32path="build/x86"
_win32build="build/x86"
_win32path="c:/scummvm"
_aos4path="Games:ScummVM"
_staticlibpath=/sw
_sdlconfig=sdl-config
@ -3517,6 +3518,7 @@ AS := $_as
ASFLAGS := $ASFLAGS
WINDRES := $_windres
WINDRESFLAGS := $WINDRESFLAGS
WIN32BUILD=$_win32build
WIN32PATH=$_win32path
AOS4PATH=$_aos4path
STATICLIBPATH=$_staticlibpath

65
ports.mk
View file

@ -162,39 +162,44 @@ osxsnap: bundle
scummvmwinres.o: $(srcdir)/icons/scummvm.ico $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(srcdir)/dists/scummvm.rc
$(QUIET_WINDRES)$(WINDRES) -DHAVE_CONFIG_H $(WINDRESFLAGS) $(DEFINES) -I. -I$(srcdir) $(srcdir)/dists/scummvm.rc scummvmwinres.o
# Special target to prepare data files for distribution / installer creation
win32data: $(EXECUTABLE)
mkdir -p $(srcdir)/$(WIN32PATH)
cp $(srcdir)/AUTHORS $(srcdir)/$(WIN32PATH)
cp $(srcdir)/COPYING $(srcdir)/$(WIN32PATH)
cp $(srcdir)/COPYING.LGPL $(srcdir)/$(WIN32PATH)
cp $(srcdir)/COPYRIGHT $(srcdir)/$(WIN32PATH)
cp $(srcdir)/NEWS $(srcdir)/$(WIN32PATH)
cp $(srcdir)/README $(srcdir)/$(WIN32PATH)
cp /usr/local/README-SDL.txt $(srcdir)/$(WIN32PATH)/README-SDL
unix2dos $(srcdir)/$(WIN32PATH)/*.*
$(STRIP) $(EXECUTABLE) -o $(srcdir)/$(WIN32PATH)/$(EXECUTABLE)
cp $(DIST_FILES_THEMES) $(srcdir)/$(WIN32PATH)
ifdef DIST_FILES_ENGINEDATA
cp $(DIST_FILES_ENGINEDATA) $(srcdir)/$(WIN32PATH)
endif
cp /usr/local/bin/SDL.dll $(srcdir)/$(WIN32PATH)
# Special target to create a win32 snapshot binary (for Inno Setup)
win32dist: win32data
cp $(srcdir)/icons/scummvm.ico $(srcdir)/$(WIN32PATH)
cp $(srcdir)/dists/win32/ScummVM.iss $(srcdir)/$(WIN32PATH)
mv $(WIN32PATH)/AUTHORS $(srcdir)/$(WIN32PATH)/AUTHORS.txt
mv $(WIN32PATH)/COPYING $(srcdir)/$(WIN32PATH)/COPYING.txt
mv $(WIN32PATH)/COPYING.LGPL $(srcdir)/$(WIN32PATH)/COPYING.LGPL.txt
mv $(WIN32PATH)/COPYRIGHT $(srcdir)/$(WIN32PATH)/COPYRIGHT.txt
mv $(WIN32PATH)/NEWS $(srcdir)/$(WIN32PATH)/NEWS.txt
mv $(WIN32PATH)/README $(srcdir)/$(WIN32PATH)/README.txt
mv $(WIN32PATH)/README-SDL $(srcdir)/$(WIN32PATH)/README-SDL.txt
win32dist: $(EXECUTABLE)
mkdir -p $(WIN32PATH)
$(STRIP) $(EXECUTABLE) -o $(WIN32PATH)/$(EXECUTABLE)
cp $(DIST_FILES_THEMES) $(WIN32PATH)
ifdef DIST_FILES_ENGINEDATA
cp $(DIST_FILES_ENGINEDATA) $(WIN32PATH)
endif
cp $(srcdir)/AUTHORS $(WIN32PATH)/AUTHORS.txt
cp $(srcdir)/COPYING $(WIN32PATH)/COPYING.txt
cp $(srcdir)/COPYING.LGPL $(WIN32PATH)/COPYING.LGPL.txt
cp $(srcdir)/COPYRIGHT $(WIN32PATH)/COPYRIGHT.txt
cp $(srcdir)/NEWS $(WIN32PATH)/NEWS.txt
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/ScummVM.iss $(WIN32PATH)
unix2dos $(WIN32PATH)/*.txt
# Special target to create a win32 NSIS installer
win32setup: win32data
makensis -V2 -Dtop_srcdir="../.." -Dtext_dir="../../$(WIN32PATH)" -Dbuild_dir="../../$(WIN32PATH)" $(srcdir)/dists/nsis/scummvm.nsi
win32setup: $(EXECUTABLE)
mkdir -p $(srcdir)/$(WIN32BUILD)
cp $(srcdir)/AUTHORS $(srcdir)/$(WIN32BUILD)
cp $(srcdir)/COPYING $(srcdir)/$(WIN32BUILD)
cp $(srcdir)/COPYING.LGPL $(srcdir)/$(WIN32BUILD)
cp $(srcdir)/COPYRIGHT $(srcdir)/$(WIN32BUILD)
cp $(srcdir)/NEWS $(srcdir)/$(WIN32BUILD)
cp $(srcdir)/README $(srcdir)/$(WIN32BUILD)
cp /usr/local/README-SDL.txt $(srcdir)/$(WIN32BUILD)/README-SDL
unix2dos $(srcdir)/$(WIN32BUILD)/*.*
$(STRIP) $(EXECUTABLE) -o $(srcdir)/$(WIN32BUILD)/$(EXECUTABLE)
cp $(DIST_FILES_THEMES) $(srcdir)/$(WIN32BUILD)
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
#
# AmigaOS specific