Mercurial > hg > Members > kono > nitros9-code

changeset 2099:c0e39b3fc9e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated
author boisy
date Wed, 13 Sep 2006 03:24:41 +0000
parents 285aeed99664
children e44dad61db50
files 3rdparty/packages/sierra/goldrush/makefile 3rdparty/packages/sierra/kingsquest1/makefile 3rdparty/packages/sierra/kingsquest2/makefile 3rdparty/packages/sierra/kingsquest3/makefile 3rdparty/packages/sierra/kingsquest4/makefile 3rdparty/packages/sierra/leisuresuitlarry/makefile 3rdparty/packages/sierra/makefile 3rdparty/packages/sierra/policequest1/makefile 3rdparty/packages/sierra/spacequest1/makefile 3rdparty/packages/sierra/spacequest2/makefile
diffstat 10 files changed, 36 insertions(+), 56 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/sierra/goldrush/makefile	Wed Sep 13 02:46:31 2006 +0000
+++ b/3rdparty/packages/sierra/goldrush/makefile	Wed Sep 13 03:24:41 2006 +0000
@@ -4,9 +4,9 @@
 
 DEPENDS		= ./makefile
 
-DISK_1_80D	= gr_d1_80d.dsk
-DISK_2_80D	= gr_d2_80d.dsk
-DISK_3_80D	= gr_d3_80d.dsk
+DISK_1_80D	= goldrush_d1_80d.dsk
+DISK_2_80D	= goldrush_d2_80d.dsk
+DISK_3_80D	= goldrush_d3_80d.dsk
 
 DISK_1_80D_NAME = "Gold Rush Disk 1"
 DISK_2_80D_NAME = "Gold Rush Disk 2"
--- a/3rdparty/packages/sierra/kingsquest1/makefile	Wed Sep 13 02:46:31 2006 +0000
+++ b/3rdparty/packages/sierra/kingsquest1/makefile	Wed Sep 13 03:24:41 2006 +0000
@@ -4,9 +4,9 @@
 
 DEPENDS		= ./makefile
 
-DISK_1_40D	= kq1_d1_40d.dsk
-DISK_2_40D	= kq1_d2_40d.dsk
-DISK_80D	= kq1_80d.dsk
+DISK_1_40D	= kingsquest1_d1_40d.dsk
+DISK_2_40D	= kingsquest1_d2_40d.dsk
+DISK_80D	= kingsquest1_80d.dsk
 
 DISK_1_40D_NAME	= "King's Quest I Disk 1"
 DISK_2_40D_NAME	= "King's Quest I Disk 2"
@@ -45,11 +45,9 @@
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 words.tok
 
-SUPPORTFILES_D2	= logDir object picDir sndDir viewDir vol.0 \
-		vol.2 words.tok
+SUPPORTFILES_D2	= object vol.0 vol.2
 
-SUPPORTFILES	= logDir object picDir sndDir viewDir vol.0 \
-		vol.1 vol.2 words.tok
+SUPPORTFILES	= object vol.0 vol.1 vol.2
 
 ALLOBJS		= $(CMDS)
 
@@ -87,7 +85,6 @@
 	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
 	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
 	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_2_40D),tOC
 	$(CPL) $(TEXTFILES) $(DISK_80D),.
 	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
 	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
--- a/3rdparty/packages/sierra/kingsquest2/makefile	Wed Sep 13 02:46:31 2006 +0000
+++ b/3rdparty/packages/sierra/kingsquest2/makefile	Wed Sep 13 03:24:41 2006 +0000
@@ -4,9 +4,9 @@
 
 DEPENDS		= ./makefile
 
-DISK_1_40D	= kq2_d1_40d.dsk
-DISK_2_40D	= kq2_d2_40d.dsk
-DISK_80D	= kq2_80d.dsk
+DISK_1_40D	= kingsquest2_d1_40d.dsk
+DISK_2_40D	= kingsquest2_d2_40d.dsk
+DISK_80D	= kingsquest2_80d.dsk
 
 DISK_1_40D_NAME	= "King's Quest II Disk 1"
 DISK_2_40D_NAME	= "King's Quest II Disk 2"
@@ -45,8 +45,7 @@
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 words.tok
 
-SUPPORTFILES_D2	= logDir object picDir sndDir viewDir vol.0 \
-		vol.2 words.tok
+SUPPORTFILES_D2	= object vol.0 vol.2
 
 SUPPORTFILES	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 words.tok
@@ -87,7 +86,6 @@
 	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
 	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
 	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_2_40D),tOC
 	$(CPL) $(TEXTFILES) $(DISK_80D),.
 	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
 	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
--- a/3rdparty/packages/sierra/kingsquest3/makefile	Wed Sep 13 02:46:31 2006 +0000
+++ b/3rdparty/packages/sierra/kingsquest3/makefile	Wed Sep 13 03:24:41 2006 +0000
@@ -4,10 +4,10 @@
 
 DEPENDS		= ./makefile
 
-DISK_1_40D	= kq3_d1_40d.dsk
-DISK_2_40D	= kq3_d2_40d.dsk
-DISK_3_40D	= kq3_d3_40d.dsk
-DISK_80D	= kq3_80d.dsk
+DISK_1_40D	= kingquest3_d1_40d.dsk
+DISK_2_40D	= kingquest3_d2_40d.dsk
+DISK_3_40D	= kingquest3_d3_40d.dsk
+DISK_80D	= kingquest3_80d.dsk
 
 DISK_1_40D_NAME = "King's Quest III Disk 1"
 DISK_2_40D_NAME = "King's Quest III Disk 2"
@@ -47,11 +47,9 @@
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.3 vol.4 vol.12 vol.14 words.tok
 
-SUPPORTFILES_D2	= logDir object picDir sndDir viewDir vol.0 \
-		vol.5 vol.6 vol.7 vol.8 vol.11 vol.12 vol.14 words.tok
+SUPPORTFILES_D2	= object vol.0 vol.5 vol.6 vol.7 vol.8 vol.11 vol.12 vol.14
 
-SUPPORTFILES_D3	= logDir object picDir sndDir viewDir vol.0 \
-		vol.5 vol.6 vol.7 vol.9 vol.11 vol.12 vol.14 words.tok
+SUPPORTFILES_D3	= object vol.0 vol.5 vol.6 vol.7 vol.9 vol.11 vol.12 vol.14
 
 SUPPORTFILES	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.3 vol.4 vol.5 vol.6 vol.7 vol.8 vol.9 \
@@ -97,10 +95,8 @@
 	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
 	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
 	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_2_40D),tOC
 	$(OS9FORMAT_DS40) -q $(DISK_3_40D) -n$(DISK_3_40D_NAME)
 	$(CP) $(SUPPORTFILES_D3) $(DISK_3_40D),.
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_3_40D),tOC
 	$(CP) $(SUPPORTFILES) $(DISK_80D),.
 	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
 
--- a/3rdparty/packages/sierra/kingsquest4/makefile	Wed Sep 13 02:46:31 2006 +0000
+++ b/3rdparty/packages/sierra/kingsquest4/makefile	Wed Sep 13 03:24:41 2006 +0000
@@ -4,9 +4,9 @@
 
 DEPENDS		= ./makefile
 
-DISK_1_40D	= kq4_d1_40d.dsk
-DISK_2_40D	= kq4_d2_40d.dsk
-DISK_3_40D	= kq4_d3_40d.dsk
+DISK_1_40D	= kingsquest4_d1_40d.dsk
+DISK_2_40D	= kingsquest4_d2_40d.dsk
+DISK_3_40D	= kingsquest4_d3_40d.dsk
 
 DISK_1_40D_NAME = "King's Quest IV Disk 1"
 DISK_2_40D_NAME = "King's Quest IV Disk 2"
@@ -36,11 +36,9 @@
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.6 vol.9 vol.11 words.tok
 
-SUPPORTFILES_D2	= logDir object picDir sndDir viewDir vol.0 \
-		vol.2 vol.3 vol.9 vol.10 vol.11 words.tok
+SUPPORTFILES_D2	= object vol.0 vol.2 vol.3 vol.9 vol.10 vol.11
 
-SUPPORTFILES_D3	= logDir object picDir sndDir viewDir vol.0 \
-		vol.4 vol.5 vol.10 vol.11 words.tok
+SUPPORTFILES_D3	= object vol.0 vol.4 vol.5 vol.10 vol.11
 
 ALLOBJS		= $(CMDS)
 
@@ -71,10 +69,8 @@
 	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
 	$(OS9FORMAT_DS80) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
 	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_2_40D),tOC
 	$(OS9FORMAT_DS80) -q $(DISK_3_40D) -n$(DISK_3_40D_NAME)
 	$(CP) $(SUPPORTFILES_D3) $(DISK_3_40D),.
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_3_40D),tOC
 
 dskcopy: dsk
 	$(CP) $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D)
--- a/3rdparty/packages/sierra/leisuresuitlarry/makefile	Wed Sep 13 02:46:31 2006 +0000
+++ b/3rdparty/packages/sierra/leisuresuitlarry/makefile	Wed Sep 13 03:24:41 2006 +0000
@@ -4,7 +4,7 @@
 
 DEPENDS		= ./makefile
 
-DISK		= lsl.dsk
+DISK		= leisuresuitlarry.dsk
 DISK_NAME	= "Leisure Suit Larry"
 
 CMDS		= sierra mnln scrn shdw
--- a/3rdparty/packages/sierra/makefile	Wed Sep 13 02:46:31 2006 +0000
+++ b/3rdparty/packages/sierra/makefile	Wed Sep 13 03:24:41 2006 +0000
@@ -1,6 +1,9 @@
 include $(NITROS9DIR)/rules.mak
 
-dirs	= kq1 kq2 kq3 kq4 pq1 sq1 sq2 lsl
+dirs	= blackcauldron goldrush \
+	kingsquest1 kingsquest2 kingsquest3 kingsquest4 \
+	leisuresuitlarry manhunter1 manhunter2 \
+	policequest1 policequest2 spacequest1 spacequest2
 
 # Make all components
 all:
--- a/3rdparty/packages/sierra/policequest1/makefile	Wed Sep 13 02:46:31 2006 +0000
+++ b/3rdparty/packages/sierra/policequest1/makefile	Wed Sep 13 03:24:41 2006 +0000
@@ -4,9 +4,9 @@
 
 DEPENDS		= ./makefile
 
-DISK_1_40D	= pq1_d1_40d.dsk
-DISK_2_40D	= pq1_d2_40d.dsk
-DISK_3_40D	= pq1_d3_40d.dsk
+DISK_1_40D	= policequest1_d1_40d.dsk
+DISK_2_40D	= policequest1_d2_40d.dsk
+DISK_3_40D	= policequest1_d3_40d.dsk
 
 DISK_1_40D_NAME = "Police Quest I Disk 1"
 DISK_2_40D_NAME = "Police Quest I Disk 2"
@@ -36,11 +36,9 @@
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 words.tok
 
-SUPPORTFILES_D2	= logDir object picDir sndDir viewDir vol.0 \
-		vol.2 words.tok
+SUPPORTFILES_D2	=  object vol.0 vol.2
 
-SUPPORTFILES_D3	= logDir object picDir sndDir viewDir vol.0 \
-		vol.3 words.tok
+SUPPORTFILES_D3	= object vol.0 vol.3
 
 SUPPORTFILES	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.3 words.tok
@@ -74,10 +72,8 @@
 	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
 	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
 	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_2_40D),tOC
 	$(OS9FORMAT_DS40) -q $(DISK_3_40D) -n$(DISK_3_40D_NAME)
 	$(CP) $(SUPPORTFILES_D3) $(DISK_3_40D),.
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_3_40D),tOC
 
 dskcopy: dsk
 	$(CP) $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D)
--- a/3rdparty/packages/sierra/spacequest1/makefile	Wed Sep 13 02:46:31 2006 +0000
+++ b/3rdparty/packages/sierra/spacequest1/makefile	Wed Sep 13 03:24:41 2006 +0000
@@ -45,8 +45,7 @@
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 words.tok
 
-SUPPORTFILES_D2	= logDir object picDir sndDir viewDir vol.0 \
-		vol.2 words.tok
+SUPPORTFILES_D2	= object vol.0 vol.2
 
 SUPPORTFILES	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 words.tok
@@ -87,7 +86,6 @@
 	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
 	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
 	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_2_40D),tOC
 	$(CPL) $(TEXTFILES) $(DISK_80D),.
 	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
 	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
--- a/3rdparty/packages/sierra/spacequest2/makefile	Wed Sep 13 02:46:31 2006 +0000
+++ b/3rdparty/packages/sierra/spacequest2/makefile	Wed Sep 13 03:24:41 2006 +0000
@@ -47,11 +47,9 @@
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 words.tok
 
-SUPPORTFILES_D2	= logDir object picDir sndDir viewDir vol.0 \
-		vol.2 words.tok
+SUPPORTFILES_D2	= object vol.0 vol.2
 
-SUPPORTFILES_D3	= logDir object picDir sndDir viewDir vol.0 \
-		vol.3 words.tok
+SUPPORTFILES_D3	= object vol.0 vol.3
 
 SUPPORTFILES	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.3 words.tok
@@ -96,10 +94,8 @@
 	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
 	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
 	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_2_40D),tOC
 	$(OS9FORMAT_DS40) -q $(DISK_3_40D) -n$(DISK_3_40D_NAME)
 	$(CP) $(SUPPORTFILES_D3) $(DISK_3_40D),.
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_3_40D),tOC
 	$(CP) $(SUPPORTFILES) $(DISK_80D),.
 	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC