Update projects in examples/asm/elmer/ to generate Mesen2 debugging i…

…nfo and to use the current linux style "--" option syntax.
jbrandwood · Dec 6, 2024 · bf32cdd · bf32cdd
1 parent b3617a6
commit bf32cdd
Show file tree

Hide file tree

Showing 25 changed files with 80 additions and 81 deletions.
diff --git a/examples/asm/elmer/cd-core-1stage/Makefile b/examples/asm/elmer/cd-core-1stage/Makefile
@@ -2,15 +2,15 @@ all: core-1stage.iso
 
 include ../Make_ex.inc
 
-AFLAGS ?= -newproc -strip -m -l 2 -S -overlay
+AFLAGS ?= --overlay --newproc --strip -m -l 2 -S -gL
 
 SRC_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm
 SRC_OVL = stage1.asm core-config.inc
 
 SRC_ISO = stage1.ovl
 
 core-1stage.iso: $(SRC_ISO)
-	$(IL) core-1stage.iso -ipl="1-Stage CD",0x4000,0x4000,0,1,2,3,4 -asm $(SRC_ISO)
+	$(IL) core-1stage.iso --ipl="1-Stage CD" $(SRC_ISO)
 
 stage1.ovl: $(SRC_OVL) $(SRC_INC)
-	$(AS) $(AFLAGS) -cd stage1.asm
+	$(AS) $(AFLAGS) --cd stage1.asm
diff --git a/examples/asm/elmer/cd-core-2stage/Makefile b/examples/asm/elmer/cd-core-2stage/Makefile
@@ -2,7 +2,7 @@ all: core-2stage.iso
 
 include ../Make_ex.inc
 
-AFLAGS ?= -newproc -strip -m -l 2 -S -overlay
+AFLAGS ?= --overlay --newproc --strip -m -l 2 -S -gA
 
 SRC1_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm
 SRC1_OVL = core-stage1.asm core-config.inc
@@ -13,13 +13,13 @@ SRC2_OVL = stage2.asm core-config.inc
 SRC_ISO  = core-stage1.bin stage2.ovl
 
 core-2stage.iso: $(SRC_ISO)
-	$(IL) core-2stage.iso -ipl="2-Stage CD",0x4000,0x4000,0,1,2,3,4 -asm $(SRC_ISO)
+	$(IL) core-2stage.iso --ipl="2-Stage CD" $(SRC_ISO)
 
 core-stage1.bin core-stage1.sym: $(SRC1_OVL) $(SRC1_INC)
-	$(AS) $(AFLAGS) -cd -trim core-stage1.asm
+	$(AS) --cd --overlay --trim core-stage1.asm
 
 core-stage1.s: core-stage1.s2i core-stage1.sym
 	$(S2I) core-stage1.s2i
 
 stage2.ovl: $(SRC2_OVL) $(SRC2_INC) core-stage1.s
-	$(AS) $(AFLAGS) -cd stage2.asm
+	$(AS) $(AFLAGS) --cd stage2.asm
diff --git a/examples/asm/elmer/cd-core-scsitest/Makefile b/examples/asm/elmer/cd-core-scsitest/Makefile
@@ -2,18 +2,18 @@ all: core-scsitest.iso scsitest.pce
 
 include ../Make_ex.inc
 
-AFLAGS ?= -newproc -strip -m -l 2 -S
+AFLAGS ?= --newproc --strip -m -l 2 -S -gA
 
 SRC_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm adpcm.asm cdrom.asm
 SRC_OVL = scsitest.asm core-config.inc
 
 SRC_ISO = scsitest.ovl ../data/alice.vdc ../data/alice.ram ../data/umbrella-16k.vox
 
 core-scsitest.iso: $(SRC_ISO)
-	$(IL) core-scsitest.iso -ipl="test-CD CD-ROM2",0x4000,0x4000,0,1,2,3,4 -asm $(SRC_ISO)
-
-scsitest.ovl: $(SRC_OVL) $(SRC_INC) scsitest.pce
-	$(AS) $(AFLAGS) -cd -overlay scsitest.asm cdrom.asm
+	$(IL) core-scsitest.iso --ipl="test-CD CD-ROM2" $(SRC_ISO)
 
 scsitest.pce: $(SRC_OVL) $(SRC_INC)
-	$(AS) $(AFLAGS) -raw scsitest.asm cdrom.asm
+	$(AS) $(AFLAGS) --raw scsitest.asm cdrom.asm
+
+scsitest.ovl: $(SRC_OVL) $(SRC_INC) scsitest.pce
+	$(AS) $(AFLAGS) --cd --overlay scsitest.asm cdrom.asm
diff --git a/examples/asm/elmer/ipl-scd/Makefile b/examples/asm/elmer/ipl-scd/Makefile
@@ -4,10 +4,10 @@ include ../Make_ex.inc
 
 SRC = ipl-scd.asm ../font/font8x8-ascii-exos.dat
 
-AFLAGS ?= -raw -m -l 2 -S
+AFLAGS ?= --raw -m -l 2 -S
 
 ipl-scd.out: $(SRC)
-	$(AS) $(AFLAGS) -ipl ipl-scd.asm -o ipl-scd.out
+	$(AS) $(AFLAGS) --ipl ipl-scd.asm -o ipl-scd.out
 
 ../include/ipl-scd.dat: ipl-scd.out
 ifeq ($(CP),copy)

diff --git a/examples/asm/elmer/rom-bare-buftest/Makefile b/examples/asm/elmer/rom-bare-buftest/Makefile
@@ -2,10 +2,10 @@ all: buftest.pce
 
 include ../Make_ex.inc
 
-AFLAGS ?= -newproc -strip -m -l 2 -S
+AFLAGS ?= --newproc --strip -m -l 2 -S -gA
 
 SRC_INC	= pceas.inc pcengine.inc joypad.asm tty.asm vce.asm vdc.asm
 SRC_OVL	= buftest.asm
 
 buftest.pce: $(SRC_OVL) $(SRC_INC)
-	$(AS) $(AFLAGS) -raw buftest.asm
+	$(AS) $(AFLAGS) --raw buftest.asm
diff --git a/examples/asm/elmer/rom-bare-mwrtest/Makefile b/examples/asm/elmer/rom-bare-mwrtest/Makefile
@@ -2,10 +2,10 @@ all: mwrtest.pce
 
 include ../Make_ex.inc
 
-AFLAGS ?= -newproc -strip -m -l 2 -S
+AFLAGS ?= --newproc --strip -m -l 2 -S -gA
 
 SRC_INC	= pceas.inc pcengine.inc joypad.asm tty.asm vce.asm vdc.asm
 SRC_OVL	= mwrtest.asm
 
 mwrtest.pce: $(SRC_OVL) $(SRC_INC)
-	$(AS) $(AFLAGS) -raw mwrtest.asm
+	$(AS) $(AFLAGS) --raw mwrtest.asm
diff --git a/examples/asm/elmer/rom-bare-rcrtest/Makefile b/examples/asm/elmer/rom-bare-rcrtest/Makefile
@@ -2,10 +2,10 @@ all: rcrtest.pce
 
 include ../Make_ex.inc
 
-AFLAGS ?= -newproc -strip -m -l 2 -S
+AFLAGS ?= --newproc --strip -m -l 2 -S -gA
 
 SRC_INC	= pceas.inc pcengine.inc joypad.asm tty.asm vce.asm vdc.asm
 SRC_OVL	= rcrtest.asm
 
 rcrtest.pce: $(SRC_OVL) $(SRC_INC)
-	$(AS) $(AFLAGS) -raw rcrtest.asm
+	$(AS) $(AFLAGS) --raw rcrtest.asm
diff --git a/examples/asm/elmer/rom-bare-tiatest/Makefile b/examples/asm/elmer/rom-bare-tiatest/Makefile
@@ -2,10 +2,10 @@ all: tiatest.pce
 
 include ../Make_ex.inc
 
-AFLAGS ?= -newproc -strip -m -l 2 -S
+AFLAGS ?= --newproc --strip -m -l 2 -S -gA
 
 SRC_INC	= pceas.inc pcengine.inc joypad.asm tty.asm vce.asm vdc.asm
 SRC_OVL	= tiatest.asm
 
 tiatest.pce: $(SRC_OVL) $(SRC_INC)
-	$(AS) $(AFLAGS) -raw tiatest.asm
+	$(AS) $(AFLAGS) --raw tiatest.asm
diff --git a/examples/asm/elmer/rom-core-hello/Makefile b/examples/asm/elmer/rom-core-hello/Makefile
@@ -2,10 +2,10 @@ all: hello.pce
 
 include ../Make_ex.inc
 
-AFLAGS ?= -newproc -strip -m -l 2 -S
+AFLAGS ?= --newproc --strip -m -l 2 -S -gA
 
 SRC_INC	= pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm
 SRC_OVL	= hello.asm core-config.inc
 
 hello.pce: $(SRC_OVL) $(SRC_INC)
-	$(AS) $(AFLAGS) -raw hello.asm
+	$(AS) $(AFLAGS) --raw hello.asm
diff --git a/examples/asm/elmer/rom-core-hugerom/Makefile b/examples/asm/elmer/rom-core-hugerom/Makefile
@@ -2,13 +2,15 @@ all: hugerom.pce hugerom.s
 
 include ../Make_ex.inc
 
-AFLAGS ?= -newproc -strip -m -l 2 -S
+AFLAGS ?= --newproc --strip -m -l 2 -S -gA
 
 SRC_INC	= pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm common.asm vdc.asm unpack-zx0.asm 
 SRC_OVL	= hugerom.asm core-config.inc
 
 hugerom.pce hugerom.sym: $(SRC_OVL) $(SRC_INC)
-	$(AS) $(AFLAGS) -sf2 -raw hugerom.asm
+	$(AS) $(AFLAGS) --sf2 --raw hugerom.asm
 
 hugerom.s: hugerom.s2i hugerom.sym
-	$(S2I) hugerom.s2i
+	$(CP) hugerom.sym hugerom.s
+
+#	$(S2I) hugerom.s2i ... currently broken, sym2inc needs to understand mesen format
diff --git a/examples/asm/elmer/rom-core-okitest/Makefile b/examples/asm/elmer/rom-core-okitest/Makefile
@@ -2,18 +2,18 @@ all: okitest.pce okitest.ovl core-okitest.iso
 
 include ../Make_ex.inc
 
-AFLAGS ?= -newproc -strip -m -l 2 -S
+AFLAGS ?= --newproc --strip -m -l 2 -S -gA
 
 SRC_INC	= pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm tty.asm vce.asm vdc.asm adpcm.asm
 SRC_OVL	= okitest.asm core-config.inc
 
 SRC_ISO = okitest.ovl
 
 okitest.pce: $(SRC_OVL) $(SRC_INC)
-	$(AS) $(AFLAGS) -raw okitest.asm
+	$(AS) $(AFLAGS) --raw okitest.asm
 
 okitest.ovl: $(SRC_OVL) $(SRC_INC) okitest.pce
-	$(AS) $(AFLAGS) -cd -overlay okitest.asm
+	$(AS) $(AFLAGS) --cd --overlay okitest.asm
 
 core-okitest.iso: $(SRC_ISO)
-	$(IL) core-okitest.iso -ipl="OKI Test CD",0x4000,0x4000,0,1,2,3,4 -asm $(SRC_ISO)
+	$(IL) core-okitest.iso -ipl="OKI Test CD" $(SRC_ISO)
diff --git a/examples/asm/elmer/rom-kickc-hello/Makefile b/examples/asm/elmer/rom-kickc-hello/Makefile
@@ -2,10 +2,10 @@ all: hello.pce
 
 include ../Make_ex.inc
 
-AFLAGS ?= -kc -newproc -strip -m -l 2 -S
+AFLAGS ?= --kc --newproc --strip -m -l 2 -S -gA
 
 SRC_INC	= pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm kickc.asm kickc-final.asm
 SRC_OVL	= hello.asm core-config.inc
 
 hello.pce: $(SRC_OVL) $(SRC_INC)
-	$(AS) $(AFLAGS) -raw hello.asm
+	$(AS) $(AFLAGS) --raw hello.asm
diff --git a/examples/asm/elmer/rom-kickc-shmup/Makefile b/examples/asm/elmer/rom-kickc-shmup/Makefile
@@ -2,10 +2,10 @@ all: shmup.pce
 
 include ../Make_ex.inc
 
-AFLAGS ?= -kc -newproc -strip -m -l 2 -S
+AFLAGS ?= --kc --newproc --strip -m -l 2 -S -gA
 
 SRC_INC	= pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm kickc.asm kickc-final.asm
 SRC_OVL	= shmup.asm core-config.inc
 
 shmup.pce: $(SRC_OVL) $(SRC_INC)
-	$(AS) $(AFLAGS) -raw shmup.asm
+	$(AS) $(AFLAGS) --raw shmup.asm
diff --git a/examples/asm/elmer/scd-bios-hello-error/Makefile b/examples/asm/elmer/scd-bios-hello-error/Makefile
@@ -2,7 +2,7 @@ all: bios-hello-error.iso
 
 include ../Make_ex.inc
 
-AFLAGS ?= -newproc -strip -m -l 2 -S -overlay
+AFLAGS ?= --overlay --newproc --strip -m -l 2 -S -gA
 
 SRC_INC = pceas.inc pcengine.inc
 SRC_OVL = hello.asm
@@ -13,12 +13,12 @@ ERR_OVL = error.asm
 SRC_ISO = hello.ovl
 
 bios-hello-error.iso: $(SRC_ISO) error.ovl
-	$(IL) bios-hello-error.iso -boot="../include/ipl-scd.dat" -ipl="SuperCD Error" -asm $(SRC_ISO) -cderr error.ovl
+	$(IL) bios-hello-error.iso --boot="../include/ipl-scd.dat" --ipl="SuperCD Error" $(SRC_ISO) --cderr error.ovl
 
 hello.ovl: $(SRC_OVL) $(SRC_INC)
-	$(AS) $(AFLAGS) -scd hello.asm
+	$(AS) $(AFLAGS) --scd hello.asm
 
-# Note that the error overlay is assembled as "-cd" and NOT "-scd"!
+# Note that the error overlay is assembled as "--cd" and NOT "--scd"!
 
 error.ovl: $(ERR_OVL) $(ERR_INC)
-	$(AS) $(AFLAGS) -cd error.asm
+	$(AS) $(AFLAGS) --cd error.asm
diff --git a/examples/asm/elmer/scd-bios-hello/Makefile b/examples/asm/elmer/scd-bios-hello/Makefile
@@ -2,15 +2,15 @@ all: bios-hello.iso
 
 include ../Make_ex.inc
 
-AFLAGS ?= -newproc -strip -m -l 2 -S -overlay
+AFLAGS ?= --overlay --newproc --strip -m -l 2 -S -gA
 
 SRC_INC = pceas.inc pcengine.inc
 SRC_OVL = hello.asm
 
 SRC_ISO = hello.ovl
 
 bios-hello.iso: $(SRC_ISO)
-	$(IL) bios-hello.iso -boot="../include/ipl-scd.dat" -ipl="Hello SuperCD" -asm $(SRC_ISO)
+	$(IL) bios-hello.iso --boot="../include/ipl-scd.dat" --ipl="Hello SuperCD" $(SRC_ISO)
 
 hello.ovl: $(SRC_OVL) $(SRC_INC)
-	$(AS) $(AFLAGS) -scd hello.asm
+	$(AS) $(AFLAGS) --scd hello.asm
diff --git a/examples/asm/elmer/scd-core-1stage-error/Makefile b/examples/asm/elmer/scd-core-1stage-error/Makefile
@@ -2,7 +2,7 @@ all: core-1stage-error.iso
 
 include ../Make_ex.inc
 
-AFLAGS ?= -newproc -strip -m -l 2 -S -overlay
+AFLAGS ?= --overlay --newproc --strip -m -l 2 -S -gA
 
 SRC_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm
 SRC_OVL = stage1.asm core-config.inc
@@ -13,12 +13,12 @@ ERR_OVL = error.asm core-config.inc saz_vdc.zx0 saz_vce.zx0
 SRC_ISO = stage1.ovl
 
 core-1stage-error.iso: $(SRC_ISO) error.ovl
-	$(IL) core-1stage-error.iso -boot="../include/ipl-scd.dat" -ipl="1-Stage-cderr CD" -asm $(SRC_ISO) -cderr error.ovl
+	$(IL) core-1stage-error.iso --ipl="1-Stage-cderr CD" $(SRC_ISO) --cderr error.ovl
 
 stage1.ovl: $(SRC_OVL) $(SRC_INC)
-	$(AS) $(AFLAGS) -scd stage1.asm
+	$(AS) $(AFLAGS) --scd stage1.asm
 
-# Note that the error overlay is assembled as "-cd" and NOT "-scd"!
+# Note that the error overlay is assembled as "--cd" and NOT "--scd"!
 
 error.ovl: $(ERR_OVL) $(ERR_INC)
-	$(AS) $(AFLAGS) -cd error.asm
+	$(AS) $(AFLAGS) --cd error.asm
diff --git a/examples/asm/elmer/scd-core-1stage/Makefile b/examples/asm/elmer/scd-core-1stage/Makefile
@@ -2,15 +2,15 @@ all: core-1stage.iso
 
 include ../Make_ex.inc
 
-AFLAGS ?= -newproc -strip -m -l 2 -S -overlay
+AFLAGS ?= --overlay --newproc --strip -m -l 2 -S -gA
 
 SRC_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm
 SRC_OVL = stage1.asm core-config.inc
 
 SRC_ISO = stage1.ovl
 
 core-1stage.iso: $(SRC_ISO)
-	$(IL) core-1stage.iso -boot="../include/ipl-scd.dat" -ipl="1-Stage SuperCD" -asm $(SRC_ISO)
+	$(IL) core-1stage.iso --ipl="1-Stage SuperCD" $(SRC_ISO)
 
 stage1.ovl: $(SRC_OVL) $(SRC_INC)
-	$(AS) $(AFLAGS) -scd stage1.asm
+	$(AS) $(AFLAGS) --scd stage1.asm
diff --git a/examples/asm/elmer/scd-core-2stage-error/Makefile b/examples/asm/elmer/scd-core-2stage-error/Makefile
@@ -2,7 +2,7 @@ all: core-2stage-error.iso
 
 include ../Make_ex.inc
 
-AFLAGS ?= -newproc -strip -m -l 2 -S -overlay
+AFLAGS ?= --overlay --newproc --strip -m -l 2 -S -gA
 
 SRC1_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm
 SRC1_OVL = core-stage1.asm core-config.inc
@@ -16,18 +16,18 @@ ERR_OVL = error.asm core-config.inc saz_vdc.zx0 saz_vce.zx0
 SRC_ISO  = core-stage1.bin stage2.ovl
 
 core-2stage-error.iso: $(SRC_ISO) error.ovl
-	$(IL) core-2stage-error.iso -ipl="2-Stage cderr CD",0x4000,0x4000,0,1,2,3,4 -asm $(SRC_ISO) -cderr error.ovl
+	$(IL) core-2stage-error.iso --ipl="2-Stage cderr CD" $(SRC_ISO) --cderr error.ovl
 
 core-stage1.bin core-stage1.sym: $(SRC1_OVL) $(SRC1_INC)
-	$(AS) $(AFLAGS) -scd -trim core-stage1.asm
+	$(AS) --scd --overlay --trim core-stage1.asm
 
 core-stage1.s: core-stage1.s2i core-stage1.sym
 	$(S2I) core-stage1.s2i
 
 stage2.ovl: $(SRC2_OVL) $(SRC2_INC) core-stage1.s
-	$(AS) $(AFLAGS) -scd stage2.asm
+	$(AS) $(AFLAGS) --scd stage2.asm
 
-# Note that the error overlay is assembled as "-cd" and NOT "-scd"!
+# Note that the error overlay is assembled as "--cd" and NOT "--scd"!
 
 error.ovl: $(ERR_OVL) $(ERR_INC) core-stage1.s
-	$(AS) $(AFLAGS) -cd error.asm
+	$(AS) $(AFLAGS) --cd error.asm
diff --git a/examples/asm/elmer/scd-core-2stage/Makefile b/examples/asm/elmer/scd-core-2stage/Makefile
@@ -2,7 +2,7 @@ all: core-2stage.iso
 
 include ../Make_ex.inc
 
-AFLAGS ?= -newproc -strip -m -l 2 -S -overlay
+AFLAGS ?= --overlay --newproc --strip -m -l 2 -S -gA
 
 SRC1_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm
 SRC1_OVL = core-stage1.asm core-config.inc
@@ -13,13 +13,13 @@ SRC2_OVL = stage2.asm core-config.inc
 SRC_ISO  = core-stage1.bin stage2.ovl
 
 core-2stage.iso: $(SRC_ISO)
-	$(IL) core-2stage.iso -ipl="2-Stage SuperCD",0x4000,0x4000,0,1,2,3,4 -asm $(SRC_ISO)
+	$(IL) core-2stage.iso --ipl="2-Stage SuperCD" $(SRC_ISO)
 
 core-stage1.bin core-stage1.sym: $(SRC1_OVL) $(SRC1_INC)
-	$(AS) $(AFLAGS) -scd -trim core-stage1.asm
+	$(AS) --scd --overlay --trim core-stage1.asm
 
 core-stage1.s: core-stage1.s2i core-stage1.sym
 	$(S2I) core-stage1.s2i
 
 stage2.ovl: $(SRC2_OVL) $(SRC2_INC) core-stage1.s
-	$(AS) $(AFLAGS) -scd stage2.asm
+	$(AS) $(AFLAGS) --scd stage2.asm
diff --git a/examples/asm/elmer/scd-core-fastcd/Makefile b/examples/asm/elmer/scd-core-fastcd/Makefile
@@ -2,18 +2,18 @@ all: core-fastcd.iso fastcd.pce
 
 include ../Make_ex.inc
 
-AFLAGS ?= -newproc -strip -m -l 2 -S
+AFLAGS ?= --newproc --strip -m -l 2 -S -gA
 
 SRC_INC = pceas.inc pcengine.inc core.inc core-startup.asm core-kernel.asm joypad.asm adpcm.asm cdrom.asm
 SRC_OVL = fastcd.asm core-config.inc
 
 SRC_ISO = fastcd.ovl ../data/alice.vdc ../data/alice.ram ../data/umbrella-16k.vox
 
 core-fastcd.iso: $(SRC_ISO)
-	$(IL) core-fastcd.iso -boot="../include/ipl-scd.dat" -ipl="Fast-CD SuperCD" -asm $(SRC_ISO)
-
-fastcd.ovl: $(SRC_OVL) $(SRC_INC) fastcd.pce
-	$(AS) $(AFLAGS) -scd -overlay fastcd.asm
+	$(IL) core-fastcd.iso --ipl="Fast-CD SuperCD" $(SRC_ISO)
 
 fastcd.pce: $(SRC_OVL) $(SRC_INC)
-	$(AS) $(AFLAGS) fastcd.asm
+	$(AS) $(AFLAGS) --raw fastcd.asm
+
+fastcd.ovl: $(SRC_OVL) $(SRC_INC) fastcd.pce
+	$(AS) $(AFLAGS) --scd --overlay fastcd.asm
diff --git a/examples/asm/elmer/ted2-bios-romcd/Makefile b/examples/asm/elmer/ted2-bios-romcd/Makefile
@@ -4,7 +4,7 @@ include ../Make_ex.inc
 
 SRC = ted2romcd.asm syscard3-ted2.inc
 
-AFLAGS ?= -raw -m -l 2 -S
+AFLAGS ?= --raw -m -l 2 -S
 
 ted2romcd.pce: $(SRC)
 	$(AS) $(AFLAGS) ted2romcd.asm