From fc189ee9d7c5f4050c723b319eccaa5483afbe7c Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Wed, 6 Jan 2021 10:53:42 -0500 Subject: [PATCH] gr: separate out rasterbars --- graphics/gr/mode7/Makefile | 28 ++++++------------- graphics/gr/mode7/apple2_1000.inc | 12 -------- .../gr/{mode7 => rasterbars}/rasterbars.s | 0 3 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 graphics/gr/mode7/apple2_1000.inc rename graphics/gr/{mode7 => rasterbars}/rasterbars.s (100%) diff --git a/graphics/gr/mode7/Makefile b/graphics/gr/mode7/Makefile index 9029d655..62a395d2 100644 --- a/graphics/gr/mode7/Makefile +++ b/graphics/gr/mode7/Makefile @@ -4,6 +4,7 @@ DOS33 = ../../../utils/dos33fs-utils/dos33 PNG2GR = ../../../utils/gr-utils/png2gr PNG2RLE = ../../../utils/gr-utils/png2rle TOKENIZE = ../../../utils/asoft_basic-utils/tokenize_asoft +LINKERSCRIPTS = ../../../linker_scripts all: mode7.dsk background @@ -11,12 +12,11 @@ $(DOS33): cd ../../../utils/dos33fs-utils && make mode7.dsk: $(DOS33) MODE7_ISLAND MODE7_CHECKERBOARD MODE7_RAINBOW \ - PLOT_TEST RASTERBARS SKY_DEMO TEXT_DEMO + PLOT_TEST SKY_DEMO TEXT_DEMO $(DOS33) -y mode7.dsk BSAVE -a 0x1000 MODE7_ISLAND $(DOS33) -y mode7.dsk BSAVE -a 0x1000 MODE7_CHECKERBOARD $(DOS33) -y mode7.dsk BSAVE -a 0x1000 MODE7_RAINBOW $(DOS33) -y mode7.dsk BSAVE -a 0x1000 PLOT_TEST - $(DOS33) -y mode7.dsk BSAVE -a 0x1000 RASTERBARS $(DOS33) -y mode7.dsk BSAVE -a 0x1000 SKY_DEMO $(DOS33) -y mode7.dsk BSAVE -a 0x1000 TEXT_DEMO @@ -25,7 +25,7 @@ mode7.dsk: $(DOS33) MODE7_ISLAND MODE7_CHECKERBOARD MODE7_RAINBOW \ ### MODE7_ISLAND: mode7_island.o - ld65 -o MODE7_ISLAND mode7_island.o -C ./apple2_1000.inc + ld65 -o MODE7_ISLAND mode7_island.o -C $(LINKERSCRIPTS)/apple2_1000.inc mode7_island.o: mode7.s island_lookup.s island_map.inc \ zp.inc sprites.inc \ @@ -40,7 +40,7 @@ mode7_island.o: mode7.s island_lookup.s island_map.inc \ ca65 -o mode7_island.o mode7.s -D ISLAND_MAP=1 -l mode7.lst MODE7_CHECKERBOARD: mode7_checkerboard.o - ld65 -o MODE7_CHECKERBOARD mode7_checkerboard.o -C ./apple2_1000.inc + ld65 -o MODE7_CHECKERBOARD mode7_checkerboard.o -C $(LINKERSCRIPTS)/apple2_1000.inc mode7_checkerboard.o: mode7.s checkerboard_lookup.s \ zp.inc sprites.inc \ @@ -57,7 +57,7 @@ mode7_checkerboard.o: mode7.s checkerboard_lookup.s \ ca65 -o mode7_checkerboard.o mode7.s -D CHECKERBOARD_MAP=1 -l mode7.lst MODE7_RAINBOW: mode7_rainbow.o - ld65 -o MODE7_RAINBOW mode7_rainbow.o -C ./apple2_1000.inc + ld65 -o MODE7_RAINBOW mode7_rainbow.o -C $(LINKERSCRIPTS)/apple2_1000.inc mode7_rainbow.o: mode7.s rainbow_lookup.s \ zp.inc sprites.inc \ @@ -72,14 +72,14 @@ mode7_rainbow.o: mode7.s rainbow_lookup.s \ ca65 -o mode7_rainbow.o mode7.s -D RAINBOW_MAP=1 -l mode7.lst PLOT_TEST: plot_test.o - ld65 -o PLOT_TEST plot_test.o -C ./apple2_1000.inc + ld65 -o PLOT_TEST plot_test.o -C $(LINKERSCRIPTS)/apple2_1000.inc plot_test.o: plot_test.s \ gr_setpage.s ca65 -o plot_test.o plot_test.s -l plot_test.lst SKY_DEMO: sky_demo.o - ld65 -o SKY_DEMO sky_demo.o -C ./apple2_1000.inc + ld65 -o SKY_DEMO sky_demo.o -C $(LINKERSCRIPTS)/apple2_1000.inc sky_demo.o: sky_demo.s \ starry_sky.scroll \ @@ -90,18 +90,8 @@ sky_demo.o: sky_demo.s \ gr_setpage.s ca65 -o sky_demo.o sky_demo.s -l sky_demo.lst -RASTERBARS: rasterbars.o - ld65 -o RASTERBARS rasterbars.o -C ./apple2_1000.inc - -rasterbars.o: rasterbars.s \ - gr_scroll.s \ - pageflip.s \ - gr_setpage.s \ - gr_fast_clear.s - ca65 -o rasterbars.o rasterbars.s -l rasterbars.lst - TEXT_DEMO: text_demo.o - ld65 -o TEXT_DEMO text_demo.o -C ./apple2_1000.inc + ld65 -o TEXT_DEMO text_demo.o -C $(LINKERSCRIPTS)/apple2_1000.inc text_demo.o: text_demo.s \ gr_scroll.s \ @@ -125,5 +115,5 @@ background.o: background.c clean: rm -f *~ *.o scroller background \ MODE7 MODE7_ISLAND MODE7_CHECKERBOARD MODE7_RAINBOW \ - PLOT_TEST RASTERBARS SKY_DEMO TEXT_DEMO *.lst + PLOT_TEST SKY_DEMO TEXT_DEMO *.lst diff --git a/graphics/gr/mode7/apple2_1000.inc b/graphics/gr/mode7/apple2_1000.inc deleted file mode 100644 index e22976de..00000000 --- a/graphics/gr/mode7/apple2_1000.inc +++ /dev/null @@ -1,12 +0,0 @@ -MEMORY { - ZP: start = $00, size = $1A, type = rw; - RAM: start = $1000, size = $8E00, file = %O; -} - -SEGMENTS { -CODE: load = RAM, type = ro; -RODATA: load = RAM, type = ro; -DATA: load = RAM, type = rw; -BSS: load = RAM, type = bss, define = yes; -ZEROPAGE: load = ZP, type = zp; -} diff --git a/graphics/gr/mode7/rasterbars.s b/graphics/gr/rasterbars/rasterbars.s similarity index 100% rename from graphics/gr/mode7/rasterbars.s rename to graphics/gr/rasterbars/rasterbars.s