Automate X16 C charset rom generation as make rule for new ROM versions

Author: pzembrod

Makefile

@@ -61,6 +61,9 @@ recompile_forths = $(patsubst forth/%, $(recompile_dir)/%, \
 forth_binaries = devenv-uF83
 forth_t64_files = $(patsubst %, autostart-c64/%.T64, $(forth_binaries))
 
+# emulator files
+x16emu_rom = $(shell emulator/which-x16emu-rom.sh)
+
 
 all: c64 c16 x16 etc
 
@@ -276,7 +279,7 @@ sut: autostart-c64/cc64.T64 autostart-c16/cc64.T64 x16files/cc64 \
   autostart-c64/cc64pe.T64 autostart-c16/cc64pe.T64 \
   autostart-c64/peddi.T64 autostart-c16/peddi.T64 \
   autostart-c64/cc64prof.T64 \
-  $(c64dir_files) $(c16dir_files) $(x16dir_files)
+  $(c64dir_files) $(c16dir_files) $(x16dir_files) emulator/x16-c-rom.bin
 
 # cc64 build rules
 
@@ -400,6 +403,9 @@ emulator/c-chargen: emulator/c-char-rom-gen
 	x64 -virtualdev +truedrive -drive8type 1541 -fs8 emulator \
 	-keybuf 'load"c-char-rom-gen",8\nrun\n'
 
+emulator/x16-c-rom.bin: $(x16emu_rom)
+	patch-c-charset -n 99328 $< $@
+	touch -m -r $< $@
 
 # Generic T64 tape image rules
 

Usage.md

@@ -333,7 +333,7 @@ The first 2k contain the upper/graphics charset, the second the lower/upper,
 first normal followed by inverse:
 
 ```
-patch-c-charset chargen-orig chargen-patched -n 2048 -i 3072
+patch-c-charset -n 2048 -i 3072 chargen-orig chargen-patched
 ```
 
 #### C16:
@@ -346,7 +346,7 @@ the normal charset needs to be patched; the lower/upper case charset starts
 at $d400, so 5k into the image:
 
 ```
-patch-c-charset kernal-orig kernal-patched -n 5120
+patch-c-charset -n 5120 kernal-orig kernal-patched
 ```
 
 #### X16:
@@ -364,7 +364,7 @@ the lower/upper case charset starts right after the 1k-long upper/graphics
 charset, so it is 97k into the image:
 
 ```
-patch-c-charset rom-orig.bin rom-patched.bin -n 99328
+patch-c-charset -n 99328 rom-orig.bin rom-patched.bin
 ```
 
 You'll find these calls in the main Makefile, with the ROM image paths as

emulator/run-in-x16emu.sh

@@ -61,7 +61,10 @@ fi
 rom=""
 # temporarily disable -rom so r46 uses its default rom until I have
 # figured out a new/better way to generate and set a C charset rom.
-# rom=-rom "${x16rom}"
+if [ -s "${x16rom}" ]
+then
+  rom="-rom ${x16rom}"
+fi
 
 x16emu \
   -keymap de \

emulator/which-x16emu-rom.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+
+emulatordir="$(realpath --relative-to="$PWD" "$(dirname "${BASH_SOURCE[0]}")")"
+source "${emulatordir}/basedir.shlib"
+
+x16emu_name="$(which x16emu)"
+x16emu_binary="$(realpath "--relative-to=$PWD" "${x16emu_name}")"
+x16emu_dir="$(dirname "${x16emu_binary}")"
+x16emu_rom="${x16emu_dir}/rom.bin"
+echo "${x16emu_rom}"