From e0d9e2a3ca97bf46583079d8adb0fe6d380936a8 Mon Sep 17 00:00:00 2001
From: Egan Ford <datajerk@gmail.com>
Date: Tue, 9 May 2023 12:04:21 -0600
Subject: [PATCH] included cc65 build, macos universal builds, refactored

---
 Makefile          |  57 ++++++++++++++++++++++-------
 asm/Makefile      |  14 ++------
 bin/c2d           | Bin 156944 -> 181744 bytes
 bin/c2d.exe       | Bin 185594 -> 186171 bytes
 bin/page2text     | Bin 8480 -> 49624 bytes
 bin/page2text.exe | Bin 28529 -> 28529 bytes
 bin/text2page     | Bin 8480 -> 49624 bytes
 bin/text2page.exe | Bin 28352 -> 28352 bytes
 c2d.c             |   3 +-
 c2d.h             |  90 +++++++++++++++++++---------------------------
 makeheader        |  45 ++++++-----------------
 11 files changed, 95 insertions(+), 114 deletions(-)

diff --git a/Makefile b/Makefile
index 19c49e5..62fcd78 100644
--- a/Makefile
+++ b/Makefile
@@ -8,32 +8,63 @@ windows: bin/c2d.exe bin/text2page.exe bin/page2text.exe
 
 dist: all windows
 
-c2d.h: c2d.h.0 asm/loader.s asm/bar.s makeheader
+cc65-sources-2.13.3.tar.bz2:
+	curl -sLO https://github.com/mrdudz/cc65-old/raw/master/cc65-sources-2.13.3.tar.bz2
+
+cc65-2.13.3/bin/cl65: cc65-sources-2.13.3.tar.bz2
+	tar zxf cc65-sources-2.13.3.tar.bz2
+	(cd cc65-2.13.3; /usr/bin/sed 's!/usr/local!'${PWD}'/cc65-2.13.3!' <make/gcc.mak >Makefile; make -j4 bins || make bins && make install || true)
+
+c2d.h: c2d.h.0 asm/loader.s asm/bar.s makeheader cc65-2.13.3/bin/cl65
 	./makeheader
 
-bin/c2d: c2d.c c2d.h
-	gcc -Wall -Wno-missing-braces -I. -O3 -o $@ $< -lm
+bin/c2d_arm: c2d.c c2d.h
+	gcc -Wall -Wno-missing-braces -I. -O3 -target arm64-apple-macos11 -o $@ $< -lm
+
+bin/text2page_arm: text2page.c
+	gcc -Wall -O3 -target arm64-apple-macos11 -o $@ $< -lm
+
+bin/page2text_arm: page2text.c
+	gcc -Wall -O3 -target arm64-apple-macos11 -o $@ $< -lm
+
+bin/mandelbrotgr_arm: mandelbrotgr.c
+	gcc -Wall -O3 -target arm64-apple-macos11 -o $@ $< -lm
+
+bin/c2d_x86: c2d.c c2d.h
+	gcc -Wall -Wno-missing-braces -I. -O3 -target x86_64-apple-macos10.12 -o $@ $< -lm
+
+bin/text2page_x86: text2page.c
+	gcc -Wall -O3 -target -x86_64-apple-macos10.12 -o $@ $< -lm
+
+bin/page2text_x86: page2text.c
+	gcc -Wall -O3 -target x86_64-apple-macos10.12 -o $@ $< -lm
+
+bin/mandelbrotgr_x86: mandelbrotgr.c
+	gcc -Wall -O3 -target x86_64-apple-macos10.12 -o $@ $< -lm
+
+bin/c2d: bin/c2d_x86 bin/c2d_arm
+	lipo -create -output $@ $<
+
+bin/text2page: bin/text2page_x86 bin/text2page_arm
+	lipo -create -output $@ $<
+
+bin/page2text: bin/page2text_x86 bin/page2text_arm
+	lipo -create -output $@ $<
+
+bin/mandelbrotgr: bin/mandelbrotgr_x86 bin/mandelbrotgr_arm
+	lipo -create -output $@ $<
 
 bin/c2d.exe: c2d.c c2d.h
 	$(WIN32GCC) -Wall -Wno-missing-braces -I. -O3 -o $@ $<
 
-bin/text2page: text2page.c
-	gcc -Wall -O3 -o $@ $< -lm
-
 bin/text2page.exe: text2page.c
 	$(WIN32GCC) -Wall -O3 -o $@ $<
 
-bin/page2text: page2text.c
-	gcc -Wall -O3 -o $@ $< -lm
-
 bin/page2text.exe: page2text.c
 	$(WIN32GCC) -Wall -O3 -o $@ $<
 
-bin/mandelbrotgr: mandelbrotgr.c
-	gcc -Wall -O3 -o $@ $< -lm
-
 clean:
-	rm -f bin/* *.dsk c2d.h c2d.h.1
+	rm -rf bin/* *.dsk c2d.h c2d.h.1 cc65-sources-2.13.3.tar.bz2 cc65-2.13.3
 	(cd asm; make clean)
 
 gameserverclient.text: Makefile
diff --git a/asm/Makefile b/asm/Makefile
index 14559cc..eef9cfc 100644
--- a/asm/Makefile
+++ b/asm/Makefile
@@ -1,9 +1,6 @@
+
 CL = cl65
 CL_FLAGS = -t none --listing --list-bytes 100
-#CL_FLAGS = -t apple1 -C apple1-16k.cfg  --listing --list-bytes 100
-CC = cl65
-CC_FLAGS = --static-locals -t apple1 -C apple1-16k.cfg
-C2T = c2t
 
 ASRC = $(shell echo *.s)
 AOBJ = $(ASRC:%.s=%.o)
@@ -17,11 +14,4 @@ clean:
 	-rm -f $(ABIN) $(AOBJ) $(ALST) $(AMON)
 
 %: %.s
-	$(CL) $(CL_FLAGS) $< 
-
-%: %.c
-	$(CC) $(CC_FLAGS) $< 
-
-%.mon: %
-	$(C2T) $< $@
-
+	$(CL) $(CL_FLAGS) $<
diff --git a/bin/c2d b/bin/c2d
index c477f2bde7c9c14c863b25bfdf25a05fbb354238..97d3dbc4cff6d065a58a3005b07c290d39cf52dc 100755
GIT binary patch
delta 8319
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
BvgiN+

delta 6506
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

diff --git a/bin/c2d.exe b/bin/c2d.exe
index 320f88c017a5d06003ad093e6ec97589478e5d82..8393615ac7973071d43aef367a9b7a9c316668a5 100755
GIT binary patch
delta 3250
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

delta 3168
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
N-DeB^>0??;{{yG(F53VA

diff --git a/bin/page2text b/bin/page2text
index 7ec06b01991915dd8329c285a2fb74d4f8c86383..7e92f2ad72ee94f4fdaf22335b6b5c7610d6636b 100755
GIT binary patch
literal 49624
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
Ry~sk%;LL(N?gq&e%wO54BxL{q

literal 8480
zcmeHMO>7%Q6n>j*5-SATks=hJC`)A{r>gQJ5K2Uaypc`U!h(>*Eut+W|7`0BJF)Ct
zDdB>v<);>1nga(UE=X`doH_IYw6vmdKrIIlm5PW!AXlM{FO&*|&3pUfuALOlNb}^G
zH*e;>Z{B<}mUee8|9PW103h@NRC@p*h~+&I;5Cr21#mwW1q);I^1=8E@r7rpw^M{p
zb61OSPN5@XOY!HII$f-In%FCjjk!S|7EH+!#x!+JV-+o3*7VX&yvDt_81&rlBt^Cx
zYXOK*wX{<)gwivWc2{?PdjdAzkmKRnZh+6h>+is0d9_ed%h=bA7jf`Hjz8JNds}wo
zr{>x5a=NJ69^H8J4&H|j0NJ>gcNN-)Iu^!a@{;UvL%uuq!QBtfJ`k>(D`P7KR#`7*
zRtv18mG6q@!qCC;=0$wDSd;~0h4jDS1u>rTbMeUb;?X(r?(>~<n@l|ObUc=D&z#h?
zPP9oR=e!V()3o~c0#v6g2LK;xp9C;!jo6ihHvS-r75UMcXnYNAI=7psqp0t}GLOY8
z<V(f74(~X%zmx#nv*jK0qk%&}=W<f7lqU<znaSLGA%`}}gIFk!$Db^1Ui$da<_90W
z|JMWI)h3-gqz?Lr1~GUL_Bl2xOCq>lilhIHS7@FYEHq~2ec(H!Tevef&cC=`(bVF^
z+yv&aoUx-RE{esCv)RSC)si+@Sk0yjR_5q`BAcZqDpr}8b}=5oSjx8~+5C??Hu1}a
zGr$?(3~&ZG1DpZQ0B7L88Boqjj>w1QLvl)9N-ZiUfBPPvL6c@K6in7~A)jKt9lAn2
zwVx9;F_bVaMiRAHXp^csRSl|cCue`se~eGxIvyB{0oe7~L#b3MUi)2nGa2&9f831K
z8s~41jelOdVva1x<KNDiVqJMhF-NM38LRds%>&;k=Kk{-{Hm3F{S8zJ<C0)(z9OGG
z*h<W9>szw%caL^dHog#KqdBU->zPk6Uy69=4}AKBVq6gFPa%vl`-8sy89wKNQroIO
zhB`U>i~hB8@**vF`rMIY@=^Ji{G!Y*d_vFmfw3sm=>@>JA?UZZ&a}ce(P)Jm6lp$m
z6_vc$3V(%qBaana|FzX><?)RRu3y6zb&XJkBD}l+!dg%W4h{G=1c1}nw+BnLiH<1l
z`zeU@gzOKV=@IF%+CTbMuicPL(QZUe_lXDq{;Ajd?Z%8TAX1wC4WGD;deA>3(mRBI
z${vq62o9pHg0}KmF7!6CyUgHfXtp^=@9xEWIRl&l&H!hCGr$?(3~&ZG1DpZQ0B3+R
zz!~^IF)+M0xIp<1N9pp=x(sKT<&_*>UO!ic4JZePqwIvLW%Fsv97VIFyCwz-4DUI6
zSTWDkH8rbiD&BpkDg5DLdU*xH^i`u58gw5?;x?!|AkfX8{k`En%eL<w>H7nHD?v?7
jOTt)t?TIeio~C^V9Cd98Z<crF#;n}h>uRrP2M6#Eo_jlb

diff --git a/bin/page2text.exe b/bin/page2text.exe
index 9d109020f7b1c05323fe79bcc99914b79b29f334..c9ddf7f110ac493ab1d38cd650e19b96ae9cbd5c 100755
GIT binary patch
delta 24
gcmex(kMZL@#t9uP*SexoCieI+r<5^lyge-s0Go~ru>b%7

delta 24
gcmex(kMZL@#t9uP1r_>{6MKA^FGVnJyge-s0F*cjQ~&?~

diff --git a/bin/text2page b/bin/text2page
index 102331f4a81743966addb7d20e2c058952917225..0266d173f6432f932e6c61c7ddcb580826dabdd8 100755
GIT binary patch
literal 49624
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

literal 8480
zcmeHMU1%d!6h70=ZbNO86pBXNrQ@>ERF~F(54#vJBMDBiXl)x=)a9C_(@imHLoy?+
z4{nyJ(!d6a_#{5;qdtp@iqP&KeQ|dm)F*|2OHHZOf`Y58jpy8%$xhO)J`4BIbI(2Z
zp7Y&vzqy5(+#7%G?DYUh-2jy?00^R9lmXrb1$zJwqH3s&O{mW%UrtWGK%?y<wYvv;
zgtLNyj7=v`Pq&Bgd|KEmj*qp$Ayh1h3uA`9Xt1)8E*WNVKi+OXZU!UAoubHhb2)$v
z6>gn|A(WXZw}v|Fiv?`FJ}1KU-2|V5ceo9Y<@9_}FX31xp61{kcjCz>-dnP-K0U`~
zOX-4cM|9#99lR9>fP8$G_Y`^#4OGSw>a^+!L%!RdgZn%@&w+5=S{a+qv+`0Qvyf*+
zqjXO^7lsa&w=Uw##iA-0%cuVhFNpb6pNmJn7mv<~_c`A^x8q~aKbK65xo1x4*eCiV
zigR8F$LaF%V*r&WcmRM8txo|6@fo{O(8oWBV?%MYCz@YGpU!O^Z5-`=s1vAOp;%Jy
zKD_hP-%tSDv*n%hqk~gG=W^66mqzn*nbDc0{0#ae51~>W*|&~d>;L8CiBGiZlOI$+
zexJ@AQU{0odNH{d9&>y&Tq3w%%A@}quh2RtQE86X9s3UHmhP^N>rX9}4ZSe(%m~&o
zm$9=cFOKTw+3aH8LeUt_FJ#ksUOC2}&1R{KhLuO6F2*C6OZ65NoBv_QCw_$p1_T3w
z0l|P^KrkQ}5Dfe`1KJlC9Z^&2bZSaF|MLdEe`>W0$JfYKf7Gh=z)%8UmbY3ps99?f
ztvXRhZJ_R=-qud7o41nDo#;+7ddrTq+s02=L#$~$9qTuKi}ePUKS$sC`_Xfos&(gq
zbCI#^w_5gVYonso2H&-=N?Pr`Z)o9_<$?H}X0!1jPdC>QR{iRwR4Nr1s^Aa=hL*`-
zp|3~0>jgf2O0zCYjW=lS)DPybiE2Gj-BkbB!Or^aq2Wt4d2;xgwbx}FRjn(MR^7%z
zLgr`M`75;X=-Ml1)K}Frm%pU9``OiKv++1~tZm8sefv6PL<z~N_atg3;vBPEm9B0L
zHc`UYF|--JiS2mpDD708YKA{TyPCrWwl*;+hhJo{^*#1zXpkBd>CH)y7K2i-ugAA4
z0pxM)2<mHl1l(-8->)Fk8?--I>yqiU+aJ2nEn_(Nm3L&j6R{4-^wr|u?UDaP+v|_W
zxG{{d=R<a4&^A6kNM9od%W3C(GUM2Tqr|9SKrkQ}5DW+g1OtKr!GK^uFd!HZ3<w4U
z1OF!m295<MsosG&T^{nwaF&^ypTW!P7fY}TrQkrEoz;zOF3sH#x<%7<F;QZ8&)LNa
zIi@e_S<}$*?mJEC4;RvN^AM(AExKWs?juRu4h;t+y4kaD1n=j*eeX!WZ_sZcXsOF3
ijIGxn>G17kT6e&4*H`dnd4Fw;*VfusYe)MyfPVm2C{wcl

diff --git a/bin/text2page.exe b/bin/text2page.exe
index da87893cfd281d8327a399749dd534cb0fcd8875..2d128e680473fb4144af57b19341ed6dec5da4ae 100755
GIT binary patch
delta 23
fcmX?bm+`<|#t9uP*SexoCieI+J;~a5>sc-UjbaQA

delta 23
fcmX?bm+`<|#t9uP1r_>{6MKA^f_*pMdX@_SfN%=3

diff --git a/c2d.c b/c2d.c
index 91655aa..dd1a733 100644
--- a/c2d.c
+++ b/c2d.c
@@ -336,7 +336,8 @@ char *getext(char *filename)
 	if (sp == strlen(filename) || sp == 0)
 		return (NULL);
 
-	if ((rval = (char *) malloc(sp * sizeof(char))) == NULL);	//do error code
+	if ((rval = (char *) malloc(sp * sizeof(char))) == NULL)
+		;	//do error code
 
 	rval[sp] = '\0';
 	for (i = 0; i < sp + i; i++)
diff --git a/c2d.h b/c2d.h
index 28f501e..7f870ce 100644
--- a/c2d.h
+++ b/c2d.h
@@ -9171,31 +9171,24 @@ gr:
 end:
 */
 unsigned char loadercode[] = {
-	0xAD,0xBE,0x0C,0xF0,0x08,0xA9,0x00,0x8D,
-	0x50,0xC0,0x8D,0x53,0xC0,0xA2,0x00,0xBD,
-	0x00,0x08,0x9D,0x00,0x04,0xBD,0x80,0x08,
-	0x9D,0x80,0x04,0xBD,0x00,0x09,0x9D,0x00,
-	0x05,0xBD,0x80,0x09,0x9D,0x80,0x05,0xBD,
-	0x00,0x0A,0x9D,0x00,0x06,0xBD,0x80,0x0A,
-	0x9D,0x80,0x06,0xBD,0x00,0x0B,0x9D,0x00,
-	0x07,0xBD,0x80,0x0B,0x9D,0x80,0x07,0xE8,
-	0xE0,0x78,0xD0,0xCB,0xA9,0x01,0xA0,0x0C,
-	0x99,0xE8,0xB7,0xA9,0x00,0xA0,0x08,0x99,
-	0xE8,0xB7,0xA9,0x02,0x85,0x04,0xA2,0x00,
-	0xBD,0x64,0x0C,0x9D,0x00,0x03,0xE8,0x10,
-	0xF7,0x4C,0x00,0x03,0xAD,0x57,0x03,0x85,
-	0x02,0xAE,0x55,0x03,0xCA,0xCA,0x86,0x00,
-	0xA5,0x04,0xA0,0x04,0x99,0xE8,0xB7,0xA5,
-	0x00,0xD0,0x05,0xAD,0x56,0x03,0x10,0x02,
-	0xA9,0x0F,0x85,0x03,0xA5,0x03,0xA0,0x05,
-	0x99,0xE8,0xB7,0xA5,0x02,0x18,0x65,0x03,
-	0xA0,0x09,0x99,0xE8,0xB7,0xA0,0xE8,0xA9,
-	0xB7,0x20,0xB5,0xB7,0xB0,0x18,0xA9,0x00,
-	0x85,0x48,0xC6,0x03,0x10,0xDE,0xA5,0x02,
-	0x18,0x69,0x10,0x85,0x02,0xE6,0x04,0xC6,
-	0x00,0x10,0xBD,0x6C,0x58,0x03,0x4C,0x69,
-	0xFF
+  0xad, 0xbe, 0x0c, 0xf0, 0x08, 0xa9, 0x00, 0x8d, 0x50, 0xc0, 0x8d, 0x53,
+  0xc0, 0xa2, 0x00, 0xbd, 0x00, 0x08, 0x9d, 0x00, 0x04, 0xbd, 0x80, 0x08,
+  0x9d, 0x80, 0x04, 0xbd, 0x00, 0x09, 0x9d, 0x00, 0x05, 0xbd, 0x80, 0x09,
+  0x9d, 0x80, 0x05, 0xbd, 0x00, 0x0a, 0x9d, 0x00, 0x06, 0xbd, 0x80, 0x0a,
+  0x9d, 0x80, 0x06, 0xbd, 0x00, 0x0b, 0x9d, 0x00, 0x07, 0xbd, 0x80, 0x0b,
+  0x9d, 0x80, 0x07, 0xe8, 0xe0, 0x78, 0xd0, 0xcb, 0xa9, 0x01, 0xa0, 0x0c,
+  0x99, 0xe8, 0xb7, 0xa9, 0x00, 0xa0, 0x08, 0x99, 0xe8, 0xb7, 0xa9, 0x02,
+  0x85, 0x04, 0xa2, 0x00, 0xbd, 0x64, 0x0c, 0x9d, 0x00, 0x03, 0xe8, 0x10,
+  0xf7, 0x4c, 0x00, 0x03, 0xad, 0x57, 0x03, 0x85, 0x02, 0xae, 0x55, 0x03,
+  0xca, 0xca, 0x86, 0x00, 0xa5, 0x04, 0xa0, 0x04, 0x99, 0xe8, 0xb7, 0xa5,
+  0x00, 0xd0, 0x05, 0xad, 0x56, 0x03, 0x10, 0x02, 0xa9, 0x0f, 0x85, 0x03,
+  0xa5, 0x03, 0xa0, 0x05, 0x99, 0xe8, 0xb7, 0xa5, 0x02, 0x18, 0x65, 0x03,
+  0xa0, 0x09, 0x99, 0xe8, 0xb7, 0xa0, 0xe8, 0xa9, 0xb7, 0x20, 0xb5, 0xb7,
+  0xb0, 0x18, 0xa9, 0x00, 0x85, 0x48, 0xc6, 0x03, 0x10, 0xde, 0xa5, 0x02,
+  0x18, 0x69, 0x10, 0x85, 0x02, 0xe6, 0x04, 0xc6, 0x00, 0x10, 0xbd, 0x6c,
+  0x58, 0x03, 0x4c, 0x69, 0xff
 };
+unsigned int loadercode_len = 185;
 /*
 ;bar.s
 ;
@@ -9405,33 +9398,24 @@ bar:
 end:
 */
 unsigned char barcode[] = {
-	0xAD,0xE7,0x0C,0xF0,0x08,0xA9,0x00,0x8D,
-	0x50,0xC0,0x8D,0x53,0xC0,0xA2,0x00,0xBD,
-	0x00,0x08,0x9D,0x00,0x04,0xBD,0x80,0x08,
-	0x9D,0x80,0x04,0xBD,0x00,0x09,0x9D,0x00,
-	0x05,0xBD,0x80,0x09,0x9D,0x80,0x05,0xBD,
-	0x00,0x0A,0x9D,0x00,0x06,0xBD,0x80,0x0A,
-	0x9D,0x80,0x06,0xBD,0x00,0x0B,0x9D,0x00,
-	0x07,0xBD,0x80,0x0B,0x9D,0x80,0x07,0xE8,
-	0xE0,0x78,0xD0,0xCB,0xA9,0x00,0x85,0x05,
-	0x85,0x06,0xA9,0x01,0xA0,0x0C,0x99,0xE8,
-	0xB7,0xA9,0x00,0xA0,0x08,0x99,0xE8,0xB7,
-	0xA9,0x02,0x85,0x04,0xA2,0x00,0xBD,0x6C,
-	0x0C,0x9D,0x00,0x03,0xE8,0xE0,0xD0,0xD0,
-	0xF5,0x4C,0x00,0x03,0xAD,0x78,0x03,0x85,
-	0x02,0xAE,0x76,0x03,0xCA,0xCA,0x86,0x00,
-	0xA5,0x04,0xA0,0x04,0x99,0xE8,0xB7,0xA5,
-	0x00,0xD0,0x05,0xAD,0x77,0x03,0x10,0x02,
-	0xA9,0x0F,0x85,0x03,0xA5,0x03,0xA0,0x05,
-	0x99,0xE8,0xB7,0xA5,0x02,0x18,0x65,0x03,
-	0xA0,0x09,0x99,0xE8,0xB7,0xA0,0xE8,0xA9,
-	0xB7,0x20,0xB5,0xB7,0xB0,0x39,0xA9,0x00,
-	0x85,0x48,0xE6,0x05,0xA6,0x06,0xBD,0x7F,
-	0x03,0xC5,0x05,0xD0,0x16,0xA5,0x06,0x18,
-	0x6D,0x7D,0x03,0x8D,0x5B,0x03,0xAD,0x7E,
-	0x03,0x8D,0x5C,0x03,0xA9,0x20,0x8D,0x00,
-	0x04,0xE6,0x06,0xC6,0x03,0x10,0xBD,0xA5,
-	0x02,0x18,0x69,0x10,0x85,0x02,0xE6,0x04,
-	0xC6,0x00,0x10,0x9C,0x6C,0x79,0x03,0x4C,
-	0x69,0xFF
+  0xad, 0xe7, 0x0c, 0xf0, 0x08, 0xa9, 0x00, 0x8d, 0x50, 0xc0, 0x8d, 0x53,
+  0xc0, 0xa2, 0x00, 0xbd, 0x00, 0x08, 0x9d, 0x00, 0x04, 0xbd, 0x80, 0x08,
+  0x9d, 0x80, 0x04, 0xbd, 0x00, 0x09, 0x9d, 0x00, 0x05, 0xbd, 0x80, 0x09,
+  0x9d, 0x80, 0x05, 0xbd, 0x00, 0x0a, 0x9d, 0x00, 0x06, 0xbd, 0x80, 0x0a,
+  0x9d, 0x80, 0x06, 0xbd, 0x00, 0x0b, 0x9d, 0x00, 0x07, 0xbd, 0x80, 0x0b,
+  0x9d, 0x80, 0x07, 0xe8, 0xe0, 0x78, 0xd0, 0xcb, 0xa9, 0x00, 0x85, 0x05,
+  0x85, 0x06, 0xa9, 0x01, 0xa0, 0x0c, 0x99, 0xe8, 0xb7, 0xa9, 0x00, 0xa0,
+  0x08, 0x99, 0xe8, 0xb7, 0xa9, 0x02, 0x85, 0x04, 0xa2, 0x00, 0xbd, 0x6c,
+  0x0c, 0x9d, 0x00, 0x03, 0xe8, 0xe0, 0xd0, 0xd0, 0xf5, 0x4c, 0x00, 0x03,
+  0xad, 0x78, 0x03, 0x85, 0x02, 0xae, 0x76, 0x03, 0xca, 0xca, 0x86, 0x00,
+  0xa5, 0x04, 0xa0, 0x04, 0x99, 0xe8, 0xb7, 0xa5, 0x00, 0xd0, 0x05, 0xad,
+  0x77, 0x03, 0x10, 0x02, 0xa9, 0x0f, 0x85, 0x03, 0xa5, 0x03, 0xa0, 0x05,
+  0x99, 0xe8, 0xb7, 0xa5, 0x02, 0x18, 0x65, 0x03, 0xa0, 0x09, 0x99, 0xe8,
+  0xb7, 0xa0, 0xe8, 0xa9, 0xb7, 0x20, 0xb5, 0xb7, 0xb0, 0x39, 0xa9, 0x00,
+  0x85, 0x48, 0xe6, 0x05, 0xa6, 0x06, 0xbd, 0x7f, 0x03, 0xc5, 0x05, 0xd0,
+  0x16, 0xa5, 0x06, 0x18, 0x6d, 0x7d, 0x03, 0x8d, 0x5b, 0x03, 0xad, 0x7e,
+  0x03, 0x8d, 0x5c, 0x03, 0xa9, 0x20, 0x8d, 0x00, 0x04, 0xe6, 0x06, 0xc6,
+  0x03, 0x10, 0xbd, 0xa5, 0x02, 0x18, 0x69, 0x10, 0x85, 0x02, 0xe6, 0x04,
+  0xc6, 0x00, 0x10, 0x9c, 0x6c, 0x79, 0x03, 0x4c, 0x69, 0xff
 };
+unsigned int barcode_len = 226;
diff --git a/makeheader b/makeheader
index 5cc45c8..0505a58 100755
--- a/makeheader
+++ b/makeheader
@@ -1,44 +1,19 @@
 #!/bin/bash
 
-header()
-{
-	FILE=$1
-	VAR=$2
-	EOL=$3
-	BYTES=$(hexdump -v $FILE | sed 's/^.......//' | wc -w | awk '{print $1}');
-
-	echo "/*"
-	expand ${FILE}.s
-	echo "*/"
-
-	printf "unsigned char $VAR[] = {\n\t"
-	
-	for i in $(hexdump -v $FILE | sed 's/^.......//');
-	do
-		printf "0x%02X" 0x$i
-		BYTES=$((BYTES - 1))
-		if ((BYTES != 0))
-		then
-			printf ","
-		fi
-		EOL=$((EOL - 1))
-		if ((EOL == 0))
-		then
-			EOL=8
-			printf "\n\t"
-		fi
-	done
-
-	printf "\n};\n"
-}
-
 cd asm
 make clean
-make
+PATH=../cc65-2.13.3/bin:$PATH make
 
 (
-header loader loadercode 8
-header bar barcode 8
+echo "/*"
+expand loader.s
+echo "*/"
+/usr/bin/xxd -i loader | sed 's/loader/loadercode/'
+
+echo "/*"
+expand bar.s
+echo "*/"
+/usr/bin/xxd -i bar | sed 's/bar/barcode/'
 ) > ../c2d.h.1
 
 cd ..