(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?
authorrubidium
Sun, 31 Aug 2008 19:46:04 +0000
changeset 10046 97d4f53904ee
parent 10045 af9efbc35972
child 10047 a5c34dea770c
(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?
Makefile.bundle
os/win32/installer/install.nsi
--- a/Makefile.bundle	Sun Aug 31 17:48:17 2008 +0000
+++ b/Makefile.bundle	Sun Aug 31 19:46:04 2008 +0000
@@ -55,6 +55,7 @@
 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)/"
--- a/os/win32/installer/install.nsi	Sun Aug 31 17:48:17 2008 +0000
+++ b/os/win32/installer/install.nsi	Sun Aug 31 19:46:04 2008 +0000
@@ -110,6 +110,7 @@
 	; 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 @@
 	; 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 @@
 	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