diff options
| author | rubidium <rubidium@openttd.org> | 2008-08-20 21:36:46 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-08-20 21:36:46 +0000 |
| commit | 2c0976037878154494841b95093815a36f3d5d73 (patch) | |
| tree | de6fdc5ff6178bfa51d6531cd3337a72570fefac /Makefile.bundle | |
| parent | ff749ab09dec34ba928338a08c16dc0d04f00e11 (diff) | |
| download | openttd-2c0976037878154494841b95093815a36f3d5d73.tar.xz | |
(svn r14115) -Codechange: add make bundle_exe which makes a windows installer and unify the files that go into the bundles (zip/gz/bz2 etc) and installer.
Diffstat (limited to 'Makefile.bundle')
| -rw-r--r-- | Makefile.bundle | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.bundle b/Makefile.bundle index 256fcccaf..f8f2cd1eb 100644 --- a/Makefile.bundle +++ b/Makefile.bundle @@ -80,7 +80,7 @@ ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/scenario/heightmaps/\"* 2>/dev/nul $(Q)cp "$(BIN_DIR)/scenario/heightmaps/"* "$(BUNDLE_DIR)/scenario/heightmap/" endif ifeq ($(TTD), openttd.exe) - $(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/COPYING" + $(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt" endif ### Packing the current bundle into several compressed file formats ### @@ -123,6 +123,12 @@ bundle_dmg: bundle $(Q)hdiutil create -ov -format UDZO -srcfolder "$(BUNDLES_DIR)/OpenTTD $(REV)" "$(BUNDLES_DIR)/$(BUNDLE_NAME).dmg" $(Q)rm -fr "$(BUNDLES_DIR)/OpenTTD $(REV)" +bundle_exe: all + @echo '[BUNDLE] Creating $(BUNDLE_NAME).exe' + $(Q)unix2dos "$(ROOT_DIR)/docs/"* "$(ROOT_DIR)/readme.txt" "$(ROOT_DIR)/COPYING" "$(ROOT_DIR)/changelog.txt" "$(ROOT_DIR)/known-bugs.txt" + $(Q)cd $(ROOT_DIR)/os/win32/installer && makensis.exe //DVERSION_INCLUDE=version_$(PLATFORM).txt install.nsi + $(Q)mv $(ROOT_DIR)/os/win32/installer/*$(PLATFORM).exe "$(BUNDLES_DIR)/$(BUNDLE_NAME).exe" + ifdef OSXAPP install: @echo '[INSTALL] Cannot install the OSX Application Bundle' |