Mercurial > hg > Members > kono > nitros9-code

diff 3rdparty/packages/sierra/leisuresuitlarry/makefile @ 2774:1868fbf470e7 lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5) changeset: 2773:ce3dba57003b branch: lwtools-port tag: tip parent: 2770:bfe3de781ddf user: Boisy Pitre <boisy.pitre@nuance.com> date: Wed Jan 23 14:54:29 2013 -0600 summary: boot_dw now uses dwinit.asm. changeset: 2772:0a3f4d8ea6d5
author Boisy Pitre <boisy.pitre@nuance.com>
date Wed, 23 Jan 2013 21:02:34 -0600
parents 05b648103e78
children 84d9d5765057
line wrap: on
line diff
--- a/3rdparty/packages/sierra/leisuresuitlarry/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/sierra/leisuresuitlarry/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,7 +1,4 @@
-ifndef	NITROS9DIR
-NITROS9DIR	= $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak
 
 vpath %.asm ../objs_lsl
 
@@ -9,9 +6,11 @@
 
 DSK_FLOPPY	= leisuresuitlarry.dsk
 DSK_DW		= leisuresuitlarry_dw.dsk
+DSK_DW_BECKER	= leisuresuitlarry_becker.dsk
+
 DSK_NAME	= "Leisure Suit Larry"
 
-DSKS		= $(DSK_FLOPPY) $(DSK_DW)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW) $(DSK_DW_BECKER)
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
@@ -19,6 +18,8 @@
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
+
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -27,6 +28,7 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
+
 BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
@@ -36,6 +38,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 SUPPORTFILES	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.3 vol.4 words.tok
 
@@ -79,8 +90,27 @@
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CP) $(SUPPORTFILES) $@,.
-	$(RM) tocgen
+	$(MOVE) tocgen toctmp
 	tocgen tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+
+$(DSK_DW_BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW) -q $@ -n$(DSK_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CP) $(SUPPORTFILES) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 dskcopy: dsk