From 88a2e1b23e2508e4dadbd9967b6a7281b943b68d Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Tue, 7 May 2024 00:50:26 -0400
Subject: [PATCH] o2024: update the build

---
 demos/outline2024/{ => cosmic_fish}/Makefile  | 24 +++++++++++++------
 .../{ => cosmic_fish}/cosmic_fish.s           |  3 ++-
 .../outline2024/{ => cosmic_fish}/file_id.diz |  0
 demos/outline2024/cosmic_fish/hello.bas       | 10 ++++++++
 demos/outline2024/hello.bas                   |  8 -------
 5 files changed, 29 insertions(+), 16 deletions(-)
 rename demos/outline2024/{ => cosmic_fish}/Makefile (66%)
 rename demos/outline2024/{ => cosmic_fish}/cosmic_fish.s (99%)
 rename demos/outline2024/{ => cosmic_fish}/file_id.diz (100%)
 create mode 100644 demos/outline2024/cosmic_fish/hello.bas
 delete mode 100644 demos/outline2024/hello.bas

diff --git a/demos/outline2024/Makefile b/demos/outline2024/cosmic_fish/Makefile
similarity index 66%
rename from demos/outline2024/Makefile
rename to demos/outline2024/cosmic_fish/Makefile
index 848406d7..3a1e74b5 100644
--- a/demos/outline2024/Makefile
+++ b/demos/outline2024/cosmic_fish/Makefile
@@ -1,16 +1,17 @@
-include ../../Makefile.inc
+include ../../../Makefile.inc
 
-DOS33 = ../../utils/dos33fs-utils/dos33
-TOKENIZE = ../../utils/asoft_basic-utils/tokenize_asoft
-EMPTYDISK = ../../empty_disk/empty.dsk
-LINKERSCRIPTS = ../../linker_scripts/
+DOS33 = ../../../utils/dos33fs-utils/dos33
+TOKENIZE = ../../../utils/asoft_basic-utils/tokenize_asoft
+EMPTYDISK = ../../../empty_disk/empty.dsk
+LINKERSCRIPTS = ../../../linker_scripts/
 
 all:	cosmic_fish.dsk
 
-cosmic_fish.dsk:	HELLO COSMIC_FISH
+cosmic_fish.dsk:	HELLO COSMIC_FISH COSMIC_FISH_QUIET
 	cp $(EMPTYDISK) cosmic_fish.dsk
 	$(DOS33) -y cosmic_fish.dsk SAVE A HELLO
 	$(DOS33) -y cosmic_fish.dsk BSAVE -a 0x2000 COSMIC_FISH
+	$(DOS33) -y cosmic_fish.dsk BSAVE -a 0x2000 COSMIC_FISH_QUIET
 
 ###
 
@@ -50,7 +51,16 @@ COSMIC_FISH:	cosmic_fish.o
 cosmic_fish.o:	cosmic_fish.s
 	ca65 -o cosmic_fish.o cosmic_fish.s -l cosmic_fish.lst
 
+###
+
+COSMIC_FISH_QUIET:	cosmic_fish_quiet.o
+	ld65 -o COSMIC_FISH_QUIET cosmic_fish_quiet.o -C $(LINKERSCRIPTS)/apple2_2000.inc
+
+cosmic_fish_quiet.o:	cosmic_fish.s
+	ca65 -o cosmic_fish_quiet.o cosmic_fish.s -DQUIET=1 -l cosmic_fish_quiet.lst
+
+
 ####
 
 clean:	
-	rm -f *~ *.o *.lst HELLO COSMIC_FISH *.zip
+	rm -f *~ *.o *.lst HELLO COSMIC_FISH COSMIC_FISH_QUIET *.zip
diff --git a/demos/outline2024/cosmic_fish.s b/demos/outline2024/cosmic_fish/cosmic_fish.s
similarity index 99%
rename from demos/outline2024/cosmic_fish.s
rename to demos/outline2024/cosmic_fish/cosmic_fish.s
index 489a48d8..fdbe081a 100644
--- a/demos/outline2024/cosmic_fish.s
+++ b/demos/outline2024/cosmic_fish/cosmic_fish.s
@@ -311,8 +311,9 @@ vsmc:
 	cmp	#48
 	bcs	no_plot
 
-
+.ifndef QUIET
 	bit	SPEAKER		; click speaker
+.endif
 
 	jsr	PLOT		; PLOT AT Y,A
 
diff --git a/demos/outline2024/file_id.diz b/demos/outline2024/cosmic_fish/file_id.diz
similarity index 100%
rename from demos/outline2024/file_id.diz
rename to demos/outline2024/cosmic_fish/file_id.diz
diff --git a/demos/outline2024/cosmic_fish/hello.bas b/demos/outline2024/cosmic_fish/hello.bas
new file mode 100644
index 00000000..2071673a
--- /dev/null
+++ b/demos/outline2024/cosmic_fish/hello.bas
@@ -0,0 +1,10 @@
+5 HOME
+10 PRINT "  COSMIC_FISH -- 256B FOR OUTLINE 2024"
+15 PRINT "           BY DEATER / DSR"
+20 PRINT CHR$(4)"CATALOG"
+22 PRINT:PRINT "PRESS Q TO RUN VERSION W/O SOUND"
+25 PRINT:PRINT "ANY OTHER KEY TO 'BRUN COSMIC_FISH'"
+30 GET A$
+32 IF A$="Q" OR A$="q" THEN PRINT:PRINT CHR$(4)"BRUN COSMIC_FISH_QUIET"
+35 PRINT
+40 PRINT CHR$(4)"BRUN COSMIC_FISH"
diff --git a/demos/outline2024/hello.bas b/demos/outline2024/hello.bas
deleted file mode 100644
index 1e89cbf1..00000000
--- a/demos/outline2024/hello.bas
+++ /dev/null
@@ -1,8 +0,0 @@
-5 HOME
-10 PRINT " COSMIC_FISH -- 256 BYTES FOR OUTLINE 2024"
-15 PRINT "           BY DEATER / DSR"
-20 PRINT CHR$(4)"CATALOG"
-25 PRINT:PRINT "PRESS ANY KEY TO 'BRUN COSMIC_FISH'"
-30 GET A$
-35 PRINT
-40 PRINT CHR$(4)"BRUN COSMIC_FISH"