Mercurial > hg > Members > kono > nitros9-code

changeset 2870:91d0226c431a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sierra/goldrush: Use same tOC for dw and dw_becker
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 24 Nov 2013 11:44:34 +0100
parents cfa6222348f7
children 5f54794048cb
files 3rdparty/packages/sierra/goldrush/makefile 3rdparty/packages/sierra/goldrush/tOC_dw.txt 3rdparty/packages/sierra/goldrush/tOC_dw3.txt 3rdparty/packages/sierra/goldrush/tOC_dw3_becker.txt
diffstat 4 files changed, 7 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/sierra/goldrush/makefile	Sun Nov 24 11:18:28 2013 +0100
+++ b/3rdparty/packages/sierra/goldrush/makefile	Sun Nov 24 11:44:34 2013 +0100
@@ -60,7 +60,6 @@
 
 TEXTFILES_D1	= ../startup tOC_80d.txt
 TEXTFILES_DW	= ../startup tOC_dw.txt
-TEXTFILES_DW_BECKER	= ../startup tOC_dw_becker.txt
 
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.9 vol.10 vol.11 vol.12 words.tok
@@ -121,8 +120,8 @@
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW_BECKER) $@,.
-	$(OS9RENAME) $@,tOC_dw_becker.txt tOC.txt
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
 	$(OS9COPY) $(SUPPORTFILES_ALL) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/3rdparty/packages/sierra/goldrush/tOC_dw.txt	Sun Nov 24 11:44:34 2013 +0100
@@ -0,0 +1,5 @@
+d1 s1 v0 v1 v9 v10 v11 v12
+d1 s1 v0 v2 v9 v10 v11
+d1 s1 v0 v3 v9 v11
+d1 s1 v0 v4 v9 v11
+d1 s1 v0 v5 v9 v11 v12
--- a/3rdparty/packages/sierra/goldrush/tOC_dw3.txt	Sun Nov 24 11:18:28 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-d1 s1 v0 v1 v9 v10 v11 v12
-d1 s1 v0 v2 v9 v10 v11
-d1 s1 v0 v3 v9 v11
-d1 s1 v0 v4 v9 v11
-d1 s1 v0 v5 v9 v11 v12
--- a/3rdparty/packages/sierra/goldrush/tOC_dw3_becker.txt	Sun Nov 24 11:18:28 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-d1 s1 v0 v1 v9 v10 v11 v12
-d1 s1 v0 v2 v9 v10 v11
-d1 s1 v0 v3 v9 v11
-d1 s1 v0 v4 v9 v11
-d1 s1 v0 v5 v9 v11 v12