summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-08-31 19:46:04 +0000
committerrubidium <rubidium@openttd.org>2008-08-31 19:46:04 +0000
commitc930fb4c81e4f78fddbf666ea802a8849f4fa0aa (patch)
tree2a475fb4c6e398daa1f6144c13770dc1ad7164f8
parent48479cd86f1ee0bb1027db53cbebb9690362d81c (diff)
downloadopenttd-c930fb4c81e4f78fddbf666ea802a8849f4fa0aa.tar.xz
(svn r14206) -Fix (r14197): why don't people just compile a trunk checkout and do we have to think about adding everything to those pesky precompiled binaries?
-rw-r--r--Makefile.bundle1
-rw-r--r--os/win32/installer/install.nsi5
2 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.bundle b/Makefile.bundle
index 66490caf4..85204de84 100644
--- a/Makefile.bundle
+++ b/Makefile.bundle
@@ -55,6 +55,7 @@ ifdef OSXAPP
endif
$(Q)cp "$(BIN_DIR)/$(TTD)" "$(TTD_DIR)/"
$(Q)cp "$(BIN_DIR)/data/"*.grf "$(DATA_DIR)/"
+ $(Q)cp "$(BIN_DIR)/data/"*.obg "$(DATA_DIR)/"
$(Q)cp "$(BIN_DIR)/data/opntitle.dat" "$(DATA_DIR)/"
$(Q)cp "$(BIN_DIR)/lang/"*.lng "$(LANG_DIR)/"
$(Q)cp "$(ROOT_DIR)/readme.txt" "$(BUNDLE_DIR)/"
diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi
index 2e5d300a1..428db5100 100644
--- a/os/win32/installer/install.nsi
+++ b/os/win32/installer/install.nsi
@@ -110,6 +110,7 @@ Section "!OpenTTD" Section1
; Copy data files
SetOutPath "$INSTDIR\data\"
File ${PATH_ROOT}bin\data\*.grf
+ File ${PATH_ROOT}bin\data\*.obg
File ${PATH_ROOT}bin\data\opntitle.dat
; Copy scenario files (don't choke if they don't exist)
SetOutPath "$INSTDIR\scenario\"
@@ -135,6 +136,7 @@ Section "!OpenTTD" Section1
; Delete old files from the main dir. they are now placed in data/ and lang/
Delete "$INSTDIR\*.lng"
Delete "$INSTDIR\*.grf"
+ Delete "$INSTDIR\*.obg"
Delete "$INSTDIR\sample.cat"
Delete "$INSTDIR\ttd.exe"
@@ -270,6 +272,9 @@ Section "Uninstall"
Delete "$INSTDIR\data\trkfoundw.grf"
Delete "$INSTDIR\data\openttdd.grf"
Delete "$INSTDIR\data\openttdw.grf"
+ Delete "$INSTDIR\data\orig_win.obg"
+ Delete "$INSTDIR\data\orig_dos.obg"
+ Delete "$INSTDIR\data\orig_dos_de.obg"
Delete "$INSTDIR\data\sample.cat"
; Windows Data files