From 471d3e309474bddc978c9d0bab3c382929552eaf Mon Sep 17 00:00:00 2001
From: 4am <a2_4am@sent.com>
Date: Fri, 8 Oct 2021 11:54:25 -0400
Subject: [PATCH] makefile sync

---
 Makefile         |  6 +++---
 bin/buildfx.sh   | 18 ++++++++++++++++++
 bin/buildhelp.sh |  1 +
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100755 bin/buildfx.sh

diff --git a/Makefile b/Makefile
index d75000e75..6c012c4b0 100644
--- a/Makefile
+++ b/Makefile
@@ -34,9 +34,9 @@ dsk: asm
 	bin/buildhelp.sh "build/HELPFUL" "build/helper.inc" >>build/log
 	$(ACME) -r build/helper.lst src/helper/helper.a >>build/log
 	bin/buildokvs.sh "res/ATTRACT.CONF" "build/ATTRACT.DATA" >>build/log
-	bin/buildokvs.sh "res/FX.CONF" "build/FX.DATA" >>build/log
-	bin/buildokvs.sh "res/DFX.CONF" "build/DFX.DATA" >>build/log
-	for f in res/TITLE res/COVER res/HELP res/GAMES.CONF build/ATTRACT.DATA build/FX.DATA build/DFX.DATA build/PREFS.CONF res/CREDITS res/HELPTEXT build/HELPER build/HELPFUL res/DECRUNCH res/JOYSTICK res/Finder.Data res/Finder.Root; do $(CADIUS) ADDFILE build/"$(DISK)" "/$(VOLUME)/" "$$f" >>build/log; done
+	bin/buildfx.sh "res/FX.CONF" "build/FX.DATA" "build/FXFUL" >>build/log
+	bin/buildfx.sh "res/DFX.CONF" "build/DFX.DATA" "build/DFXFUL" >>build/log
+	for f in res/TITLE res/COVER res/HELP res/GAMES.CONF build/ATTRACT.DATA build/FX.DATA build/FXFUL build/DFX.DATA build/DFXFUL build/PREFS.CONF res/CREDITS res/HELPTEXT build/HELPER build/HELPFUL res/DECRUNCH res/JOYSTICK res/Finder.Data res/Finder.Root; do $(CADIUS) ADDFILE build/"$(DISK)" "/$(VOLUME)/" "$$f" >>build/log; done
 	bin/buildfileinfo.sh res/TITLE.HGR "06" "4000" >>build/log
 	bin/buildfileinfo.sh res/TITLE.DHGR "06" "4000" >>build/log
 	bin/buildfileinfo.sh res/ACTION.HGR "06" "3FF8" >>build/log
diff --git a/bin/buildfx.sh b/bin/buildfx.sh
new file mode 100755
index 000000000..d08678fb1
--- /dev/null
+++ b/bin/buildfx.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+:>| "$3"
+records=$(mktemp)
+grep -v "^$" < "$1" | grep -v "^#" | grep -v "^\[" > "$records"
+source=$(mktemp)
+(echo "*=0"
+ echo "!le16 $(wc -l <"$records"), 0"
+ while read -r key; do
+     echo "!byte ${#key}+5"
+     echo "!byte ${#key}"
+     echo "!text \"$key\""
+     echo "!be24 $(wc -c <"$3")"
+     cat "build/FX/$key" >> "$3"
+ done < "$records") > "$source"
+acme -o "$2" "$source"
+rm "$source"
+rm "$records"
diff --git a/bin/buildhelp.sh b/bin/buildhelp.sh
index 3adc5b97f..89dd0e0df 100755
--- a/bin/buildhelp.sh
+++ b/bin/buildhelp.sh
@@ -2,6 +2,7 @@
 
 # run from project root directory
 
+:>| "$1"
 games=$(grep "," res/GAMES.CONF | grep -v "^#" | cut -d"," -f2 | cut -d"=" -f1 | sort)
 cp res/GAMEHELP/STANDARD "$1"
 for c in {A..Z}; do