From 8b506068a1189cdff10df7135471049424ad13aa Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 23 Jan 2022 09:44:18 -0600
Subject: [PATCH] update exomizer to 3.1.1 with fast decruncher flags (#13)

* Extract exomizer base command

* update exomizer to 3.1.1 with fast decruncher flags

This increases the size of charset3 to 4 blocks instead of 3,
and is said to give faster decrunch time.

It also updates the exomizer submodule to point at the official upstream,
not a defunct github mirror.
---
 .gitmodules |  2 +-
 Makefile    | 13 +++++++------
 exomizer    |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 3ffd1fd..3a911b2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,4 @@
 	url = https://github.com/cc65/cc65
 [submodule "exomizer"]
 	path = exomizer
-	url = https://github.com/bitshifters/exomizer
+	url = https://bitbucket.org/magli143/exomizer/
diff --git a/Makefile b/Makefile
index b92b9a7..a9fb29e 100755
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,11 @@ endif
 	done
 	mv -f 80columns.d64.tmp 80columns.d64
 
+EXOMIZER_SFX := exomizer sfx 51200 -q -n -T4 -M256 -Di_perf=2
 .INTERMEDIATE: charset.bin
 charset.prg: charset.bin
 	(printf '\0\320'; cat $<) > $@.tmp
-	exomizer sfx 51200 -q -n -o $@ $@.tmp
+	$(EXOMIZER_SFX) -o $@ $@.tmp
 	rm -f $@.tmp
 
 charset.bin: charset.o charset.cfg
@@ -27,14 +28,14 @@ charset.bin: charset.o charset.cfg
 
 charset%.prg: charset%.bin
 	(printf '\0\320'; cat $<) > $@.tmp
-	exomizer sfx 51200 -q -n -o $@ $@.tmp
+	$(EXOMIZER_SFX) -o $@ $@.tmp
 	rm -f $@.tmp
 
 charset%.bin: charset%.o charset.cfg
 	ld65 -C charset.cfg $< -o $@
 
 %-compressed.prg: %-uncompressed.prg
-	exomizer sfx 51200 -q -n -o $@ $<
+	$(EXOMIZER_SFX) -o $@ $<
 
 %-uncompressed.prg: %.bin
 	(printf '\0\310'; cat $<) > $@
@@ -80,13 +81,13 @@ toolchain-cc65:
 
 .PHONY: toolchain-exomizer
 toolchain-exomizer:
-	[ -d exomizer/exomizer2/src ] || git submodule update --init exomizer
+	[ -d exomizer/src ] || git submodule update --init exomizer
 
-	$(MAKE) -C exomizer/exomizer2/src CFLAGS="-Wall -Wstrict-prototypes -pedantic -O3"
+	$(MAKE) -C exomizer/src CFLAGS="-Wall -Wstrict-prototypes -pedantic -O3"
 
 	mkdir -p bin
 
-	cp exomizer/exomizer2/src/exomizer bin/
+	cp exomizer/src/exomizer bin/
 
 	# have to do this, or git will report untracked files
 	(cd exomizer && git clean -dxf)
diff --git a/exomizer b/exomizer
index 2426d97..6a152b5 160000
--- a/exomizer
+++ b/exomizer
@@ -1 +1 @@
-Subproject commit 2426d97207c8dff23cd2a94cc768c8be87a7b5d0
+Subproject commit 6a152b5605648f7a41eadd4b011a93ec92f74dd8