From c76391f23d0a18d20163d733377387823d0cdf69 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 5 Jan 2021 18:42:30 -0500 Subject: [PATCH] graphics: all makefiles/readmes in place --- graphics/Makefile | 16 +++++ graphics/README | 20 +++++++ graphics/hgr/Makefile | 16 ++--- graphics/hgr_viewer/Makefile | 112 +++++++++++++++++++++++++++++++++++ 4 files changed, 156 insertions(+), 8 deletions(-) create mode 100644 graphics/Makefile create mode 100644 graphics/README create mode 100644 graphics/hgr_viewer/Makefile diff --git a/graphics/Makefile b/graphics/Makefile new file mode 100644 index 00000000..6ef00a9d --- /dev/null +++ b/graphics/Makefile @@ -0,0 +1,16 @@ +all: + cd dhgr && make + cd dhgr_viewer && make + cd gr && make +# cd gr_viewer && make + cd hgr && make +# cd hgr_viewer && make + +clean: + cd dhgr && make clean + cd dhgr_viewer && make clean + cd gr && make clean + cd gr_viewer && make clean + cd hgr && make clean + cd hgr_viewer && make clean + rm -f *~ diff --git a/graphics/README b/graphics/README new file mode 100644 index 00000000..d1b33036 --- /dev/null +++ b/graphics/README @@ -0,0 +1,20 @@ +Testbeds for various graphics modes + ++ dhgr + code testing out double-hires + ++ dhgr_viewer + a double-hires image viewer + ++ gr + code for testing lores + ++ gr_viewer + a lo-res image viewer + ++ hgr + code for testing hires + ++ hgr_viewer + a hi-res image viewer + diff --git a/graphics/hgr/Makefile b/graphics/hgr/Makefile index 8a0bc975..f9ce78a2 100644 --- a/graphics/hgr/Makefile +++ b/graphics/hgr/Makefile @@ -1,7 +1,7 @@ -include ../Makefile.inc +include ../../Makefile.inc -DOS33 = ../dos33fs-utils/dos33 -TOKENIZE = ../asoft_basic-utils/tokenize_asoft +DOS33 = ../../utils/dos33fs-utils/dos33 +TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft all: hgr.dsk @@ -16,7 +16,7 @@ hgr.dsk: SNOW SNOW2 SNOW3 STARS FASTAR ### FASTAR: fastar.o - ld65 -o FASTAR fastar.o -C ../linker_scripts/apple2_c00.inc + ld65 -o FASTAR fastar.o -C ../../linker_scripts/apple2_c00.inc fastar.o: fastar.s ca65 -o fastar.o fastar.s -l fastar.lst @@ -25,7 +25,7 @@ fastar.o: fastar.s ### STARS: stars.o - ld65 -o STARS stars.o -C ../linker_scripts/apple2_300.inc + ld65 -o STARS stars.o -C ../../linker_scripts/apple2_300.inc stars.o: stars.s ca65 -o stars.o stars.s -l stars.lst @@ -33,7 +33,7 @@ stars.o: stars.s ### SNOW: snow.o - ld65 -o SNOW snow.o -C ../linker_scripts/apple2_300.inc + ld65 -o SNOW snow.o -C ../../linker_scripts/apple2_300.inc snow.o: snow.s ca65 -o snow.o snow.s -l snow.lst @@ -41,7 +41,7 @@ snow.o: snow.s ### SNOW2: snow2.o - ld65 -o SNOW2 snow2.o -C ../linker_scripts/apple2_300.inc + ld65 -o SNOW2 snow2.o -C ../../linker_scripts/apple2_300.inc snow2.o: snow2.s ca65 -o snow2.o snow2.s -l snow2.lst @@ -58,4 +58,4 @@ snow3.o: snow3.s ### clean: - rm -f *~ *.o *.lst SNOW SNOW2 SNOW3 + rm -f *~ *.o *.lst SNOW SNOW2 SNOW3 STARS diff --git a/graphics/hgr_viewer/Makefile b/graphics/hgr_viewer/Makefile new file mode 100644 index 00000000..34307a44 --- /dev/null +++ b/graphics/hgr_viewer/Makefile @@ -0,0 +1,112 @@ +include ../../Makefile.inc + +DOS33 = ../../utils/dos33fs-utils/dos33 +B2D = ../../utils/bmp2dhr/b2d +PNG_TO_40x96 = ../../utils/gr-utils/png_to_40x96 +PNG_TO_RLE = ../../utils/gr-utils/png2rle + +all: hires.dsk + +hires.dsk: HELLO HIRES bbl.img.lz4t bbl2.img.lz4t \ + girl.hgr.lz4t 1bg.hgr.lz4t fup.hgr.lz4t witch.hgr.lz4t + $(DOS33) -y hires.dsk SAVE A HELLO + $(DOS33) -y hires.dsk BSAVE -a 0x0c00 HIRES + $(DOS33) -y hires.dsk BSAVE -a 0xa000 bbl.img.lz4t BBL.LZ4 + $(DOS33) -y hires.dsk BSAVE -a 0xa000 bbl2.img.lz4t BBL2.LZ4 + $(DOS33) -y hires.dsk BSAVE -a 0xa000 girl.hgr.lz4t GIRL.LZ4 + $(DOS33) -y hires.dsk BSAVE -a 0xa000 1bg.hgr.lz4t OBG.LZ4 + $(DOS33) -y hires.dsk BSAVE -a 0xa000 fup.hgr.lz4t FUP.LZ4 + $(DOS33) -y hires.dsk BSAVE -a 0xa000 witch.hgr.lz4t WITCH.LZ4 + +#### + +HIRES: hires.o + ld65 -o HIRES hires.o -C ../../linker_scripts/apple2_c00.inc + +hires.o: hires.s \ + zp.inc hardware.inc + ca65 -o hires.o hires.s -l hires.lst + +#### + +HELLO: hello.bas + $(TOKENIZE) < hello.bas > HELLO + +#### + +bbl.img.lz4t: bbl.img.lz4 + dd if=bbl.img.lz4 of=bbl.img.lz4t bs=1 skip=11 + truncate bbl.img.lz4t -s -8 + +bbl.img.lz4: bbl.img + lz4 -f -16 bbl.img + +bbl.img: bbl.png + ../hgr-utils/png2hgr bbl.png > bbl.img + +#### + +bbl2.img.lz4t: bbl2.img.lz4 + dd if=bbl2.img.lz4 of=bbl2.img.lz4t bs=1 skip=11 + truncate bbl2.img.lz4t -s -8 + +bbl2.img.lz4: bbl2.img + lz4 -f -16 bbl2.img + +bbl2.img: bbl2.png + ../hgr-utils/png2hgr bbl2.png > bbl2.img + +#### + +1bg.hgr.lz4t: 1bg.hgr.lz4 + dd if=1bg.hgr.lz4 of=1bg.hgr.lz4t bs=1 skip=11 + truncate 1bg.hgr.lz4t -s -8 + +1bg.hgr.lz4: 1bg.hgr + lz4 -f -16 1bg.hgr + +1bg.hgr: 1bg.png + ../hgr-utils/png2hgr 1bg.png > 1bg.hgr + + +#### + +fup.hgr.lz4t: fup.hgr.lz4 + dd if=fup.hgr.lz4 of=fup.hgr.lz4t bs=1 skip=11 + truncate fup.hgr.lz4t -s -8 + +fup.hgr.lz4: fup.hgr + lz4 -f -16 fup.hgr + +fup.hgr: fup.png + ../hgr-utils/png2hgr fup.png > fup.hgr + +#### + +witch.hgr.lz4t: witch.hgr.lz4 + dd if=witch.hgr.lz4 of=witch.hgr.lz4t bs=1 skip=11 + truncate witch.hgr.lz4t -s -8 + +witch.hgr.lz4: witch.hgr + lz4 -f -16 witch.hgr + +witch.hgr: witch.png + ../hgr-utils/png2hgr witch.png > witch.hgr + + + +### + +girl.hgr.lz4t: girl.hgr.lz4 + dd if=girl.hgr.lz4 of=girl.hgr.lz4t bs=1 skip=11 + truncate girl.hgr.lz4t -s -8 + +girl.hgr.lz4: girl.hgr + lz4 -f -16 girl.hgr + +### + + +clean: + rm -f *~ *.o *.lst HIRES +