From 53df767f1bc4c57b4d2dd8b3f23d17dad2a590a6 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 5 Jan 2021 23:19:25 -0500 Subject: [PATCH] disk: missing makefiles --- disk/disk_bug/Makefile | 18 +++++++++--------- disk/qboot/Makefile | 12 ++++++------ disk/qboot/README | 2 ++ disk/qboot2/Makefile | 18 +++++++++--------- 4 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 disk/qboot/README diff --git a/disk/disk_bug/Makefile b/disk/disk_bug/Makefile index c6d187f7..9ce956a1 100644 --- a/disk/disk_bug/Makefile +++ b/disk/disk_bug/Makefile @@ -1,11 +1,11 @@ -include ../Makefile.inc +include ../../Makefile.inc -DOS33 = ../dos33fs-utils/dos33 -DOS33_RAW = ../dos33fs-utils/dos33_raw -PNG_TO_40x96 = ../gr-utils/png_to_40x96 -PNG_TO_40x48D = ../gr-utils/png_to_40x48d -PNG2RLE = ../gr-utils/png2rle -B2D = ../bmp2dhr/b2d +DOS33 = ../../utils/dos33fs-utils/dos33 +DOS33_RAW = ../../utils/dos33fs-utils/dos33_raw +PNG_TO_40x96 = ../../utils/gr-utils/png_to_40x96 +PNG_TO_40x48D = ../../utils/gr-utils/png_to_40x48d +PNG2RLE = ../../utils/gr-utils/png2rle +B2D = ../../utils/bmp2dhr/b2d all: disk_test1.dsk @@ -20,7 +20,7 @@ disk_test1.dsk: QBOOT TEST ### TEST: test.o - ld65 -o TEST test.o -C ../linker_scripts/apple2_1200.inc + ld65 -o TEST test.o -C ../../linker_scripts/apple2_1200.inc test.o: test.s ca65 -o test.o test.s -l test.lst @@ -28,7 +28,7 @@ test.o: test.s ### QBOOT: qboot_sector.o - ld65 -o QBOOT qboot_sector.o -C ../linker_scripts/apple2_800.inc + ld65 -o QBOOT qboot_sector.o -C ../../linker_scripts/apple2_800.inc qboot_sector.o: qboot_sector.s qboot_stage2.s ca65 -o qboot_sector.o qboot_sector.s -l qboot_sector.lst diff --git a/disk/qboot/Makefile b/disk/qboot/Makefile index 88451900..1bd05bee 100644 --- a/disk/qboot/Makefile +++ b/disk/qboot/Makefile @@ -1,7 +1,7 @@ -include ../Makefile.inc +include ../../Makefile.inc -DOS33 = ../dos33fs-utils/dos33 -DOS33_RAW = ../dos33fs-utils/dos33_raw +DOS33 = ../../utils/dos33fs-utils/dos33 +DOS33_RAW = ../../utils/dos33fs-utils/dos33_raw all: boot.dsk compare.dsk @@ -19,7 +19,7 @@ boot.dsk: BOOT THE80S LS $(DOS33_RAW) boot.dsk 8 0 LS 0 33 BOOT: boot_sector.o - ld65 -o BOOT boot_sector.o -C ../linker_scripts/apple2_800.inc + ld65 -o BOOT boot_sector.o -C ../../linker_scripts/apple2_800.inc boot_sector.o: boot_sector.s stage2.s ca65 -o boot_sector.o boot_sector.s -l boot_sector.lst @@ -27,7 +27,7 @@ boot_sector.o: boot_sector.s stage2.s ### LS: ls.o - ld65 -o LS ls.o -C ../linker_scripts/apple2_1f00.inc + ld65 -o LS ls.o -C ../../linker_scripts/apple2_1f00.inc ls.o: ls.s lsc.hgr ca65 -o ls.o ls.s -l ls.lst @@ -35,7 +35,7 @@ ls.o: ls.s lsc.hgr ### THE80S: 80s.o - ld65 -o THE80S 80s.o -C ../linker_scripts/apple2_1f00.inc + ld65 -o THE80S 80s.o -C ../../linker_scripts/apple2_1f00.inc 80s.o: 80s.s new_80s.hgr ca65 -o 80s.o 80s.s -l 80s.lst diff --git a/disk/qboot/README b/disk/qboot/README new file mode 100644 index 00000000..1d592d86 --- /dev/null +++ b/disk/qboot/README @@ -0,0 +1,2 @@ +testing out qkumba's qboot + diff --git a/disk/qboot2/Makefile b/disk/qboot2/Makefile index 3abc9795..b459d310 100644 --- a/disk/qboot2/Makefile +++ b/disk/qboot2/Makefile @@ -1,7 +1,7 @@ -include ../Makefile.inc +include ../../Makefile.inc -DOS33 = ../dos33fs-utils/dos33 -DOS33_RAW = ../dos33fs-utils/dos33_raw +DOS33 = ../../utils/dos33fs-utils/dos33 +DOS33_RAW = ../../utils/dos33fs-utils/dos33_raw all: boot.dsk @@ -17,7 +17,7 @@ boot.dsk: BOOT THE80S LS MY1 MY2 MY3 $(DOS33_RAW) boot.dsk 23 0 MY3 0 33 BOOT: boot_sector.o - ld65 -o BOOT boot_sector.o -C ../linker_scripts/apple2_800.inc + ld65 -o BOOT boot_sector.o -C ../../linker_scripts/apple2_800.inc boot_sector.o: boot_sector.s stage2.s ca65 -o boot_sector.o boot_sector.s -l boot_sector.lst @@ -25,7 +25,7 @@ boot_sector.o: boot_sector.s stage2.s ### LS: ls.o - ld65 -o LS ls.o -C ../linker_scripts/apple2_1f00.inc + ld65 -o LS ls.o -C ../../linker_scripts/apple2_1f00.inc ls.o: ls.s lsc.hgr ca65 -o ls.o ls.s -l ls.lst @@ -33,7 +33,7 @@ ls.o: ls.s lsc.hgr ### MY1: my1.o - ld65 -o MY1 my1.o -C ../linker_scripts/apple2_1f00.inc + ld65 -o MY1 my1.o -C ../../linker_scripts/apple2_1f00.inc my1.o: my1.s ca65 -o my1.o my1.s -l my1.lst @@ -41,7 +41,7 @@ my1.o: my1.s ### MY2: my2.o - ld65 -o MY2 my2.o -C ../linker_scripts/apple2_1f00.inc + ld65 -o MY2 my2.o -C ../../linker_scripts/apple2_1f00.inc my2.o: my2.s ca65 -o my2.o my2.s -l my2.lst @@ -49,7 +49,7 @@ my2.o: my2.s ### MY3: my3.o - ld65 -o MY3 my3.o -C ../linker_scripts/apple2_1f00.inc + ld65 -o MY3 my3.o -C ../../linker_scripts/apple2_1f00.inc my3.o: my3.s ca65 -o my3.o my3.s -l my3.lst @@ -59,7 +59,7 @@ my3.o: my3.s ### THE80S: 80s.o - ld65 -o THE80S 80s.o -C ../linker_scripts/apple2_1f00.inc + ld65 -o THE80S 80s.o -C ../../linker_scripts/apple2_1f00.inc 80s.o: 80s.s new_80s.hgr ca65 -o 80s.o 80s.s -l 80s.lst