From fd2d060a915fb8b8ad941148201eadbf8c987e21 Mon Sep 17 00:00:00 2001
From: nino-porcino <nino.porcino@gmail.com>
Date: Tue, 18 Jan 2022 15:14:59 +0100
Subject: [PATCH] remove "_apple1" suffix for plain apple1 binaries

---
 tools/build.bat | 10 +++++-----
 tools/build.sh  | 11 ++++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/tools/build.bat b/tools/build.bat
index d4bfc23..23d3656 100644
--- a/tools/build.bat
+++ b/tools/build.bat
@@ -8,12 +8,13 @@ call kickc -includedir %TMS9918%\lib -targetdir %TMS9918%\kickc\ -t vic20_8k %TA
 copy out\%TARGET%.prg out\%TARGET%_vic20.prg
 
 @echo ======================== APPLE 1 JUKEBOX =================================================
-call kickc -includedir %TMS9918%\lib -targetdir %TMS9918%\kickc\ -t apple1_jukebox %TARGET%.c -o out\%TARGET%_apple1.prg -e
-call node %TMS9918%\tools\mkeprom out out\%TARGET%_apple1.bin
+call kickc -includedir %TMS9918%\lib -targetdir %TMS9918%\kickc\ -t apple1_jukebox %TARGET%.c -o out\%TARGET%.prg -e
+call node %TMS9918%\tools\mkeprom out out\%TARGET%_jukebox.bin
 
 @echo ======================== APPLE 1 =================================================
-call kickc -includedir %TMS9918%\lib -targetdir %TMS9918%\kickc\ -t apple1 %TARGET%.c -o out\%TARGET%_apple1.prg -e
-copy out\%TARGET%.prg out\%TARGET%_apple1.prg
+call kickc -includedir %TMS9918%\lib -targetdir %TMS9918%\kickc\ -t apple1 %TARGET%.c -o out\%TARGET%.prg -e
+call node %TMS9918%\tools\prg2bin -i out\%TARGET%.prg -o out\%TARGET%.bin
+call node %TMS9918%\tools\prg2woz -i out\%TARGET%.prg -o out\%TARGET%.woz
 
 @rem clean up files
 @del out\apple1_codeseg.bin
@@ -22,4 +23,3 @@ copy out\%TARGET%.prg out\%TARGET%_apple1.prg
 @del out\*.klog
 @del out\*.vs
 @del out\*.dbg
-@del out\%TARGET%.prg
diff --git a/tools/build.sh b/tools/build.sh
index 30f5004..b743995 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -10,12 +10,13 @@ kickc.sh -includedir ${TMS9918}/lib -targetdir ${TMS9918}/kickc/ -t vic20_8k ${T
 cp out/${TARGET}.prg out/${TARGET}_vic20.prg
 
 echo ======================== APPLE 1 JUKEBOX =================================================
-kickc.sh -includedir ${TMS9918}/lib -targetdir ${TMS9918}/kickc/ -t apple1_jukebox ${TARGET}.c -o out/${TARGET}_apple1.prg -e
-node ${TMS9918}/tools/mkeprom out out/${TARGET}_apple1.bin
+kickc.sh -includedir ${TMS9918}/lib -targetdir ${TMS9918}/kickc/ -t apple1_jukebox ${TARGET}.c -o out/${TARGET}.prg -e
+node ${TMS9918}/tools/mkeprom out out/${TARGET}_jukebox.bin
 
 echo ======================== APPLE 1 =================================================
-kickc.sh -includedir ${TMS9918}/lib -targetdir ${TMS9918}/kickc/ -t apple1 ${TARGET}.c -o out/${TARGET}_apple1.prg -e
-cp out/${TARGET}.prg out/${TARGET}_apple1.prg
+kickc.sh -includedir ${TMS9918}/lib -targetdir ${TMS9918}/kickc/ -t apple1 ${TARGET}.c -o out/${TARGET}.prg -e
+node ${TMS9918}/tools/prg2bin -i out/${TARGET}.prg -o out/${TARGET}.bin
+node ${TMS9918}/tools/prg2woz -i out/${TARGET}.prg -o out/${TARGET}.woz
 
 # clean up files
 rm -f out/apple1_codeseg.bin
@@ -24,4 +25,4 @@ rm -f out/*.vs
 rm -f out/*.klog
 rm -f out/*.vs
 rm -f out/*.dbg
-rm -f out/${TARGET}.prg
+