X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=1df105e47f6445f124df0ea960ae096f60f564eb;hb=53f0ac4ab1e61b441ac92606faa7b138e559b324;hp=b44b3597a3555f148c4baac201ce1de34ed07112;hpb=1948f8cdda59d3b5cbcc72e3902a832108bca7ff;p=c128-kasse

diff --git a/Makefile b/Makefile
index b44b359..1df105e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,54 +1,64 @@
 CC=cc65
 AS=ca65
 LD=cl65
-INCLUDES:=$(wildcard include/*.h) include/version.h
+INCLUDES:=$(wildcard include/*.h) include/version.h include/charset_umlauts.h
 GV:=$(shell git describe --tags --always)
-CFLAGS= -I include -t c128
+CFLAGS= -I include -t c128 -g
 
-.PHONY: include/version.h clean dist-clean
+.PHONY: include/version.h include/charset_umlauts.h clean dist-clean format
 
-all: kasse itemz
+all: kasse itemz cat
 
-%.o: %.c ${INCLUDES}
-	${CC} ${CFLAGS} -O $<
-	${AS} ${CFLAGS} $(addsuffix .s,$(basename $< ))
+build/%.o: src/%.c ${INCLUDES}
+	${CC} ${CFLAGS} -O $< -o build/$(addsuffix .s,$(shell basename $< .c))
+	${AS} ${CFLAGS} build/$(addsuffix .s,$(shell basename $< .c)) -o $@
+
+build/%.o: src/%.s
+	${AS} ${CFLAGS} $< -o $@
 
 include/version.h:
+	mkdir -p build
 	echo "#define GV \"${GV}\"" > $@
 
-kasse: src/config.o src/kasse.o src/general.o src/credit_manager.o src/c128time.o src/print.o
-	${LD} -t c128 $^ -o $@
+include/charset_umlauts.h:
+	./util/mkfont assets/umlauts.pbm chars_umlauts > $@
+
+kasse: build/config.o build/kasse.o build/general.o build/credit_manager.o build/c128time.o build/print.o build/vdc_patch_charset.o build/vdc_util.o
+	${LD} -Ln $@.lbl -t c128 $^ -o $@
+
+itemz: build/config.o build/itemz.o build/general.o build/credit_manager.o build/c128time.o build/print.o
+	${LD} -Ln $@.lbl -t c128 $^ -o $@
 
-itemz: src/config.o src/itemz.o src/general.o src/credit_manager.o src/c128time.o src/print.o
-	${LD} -t c128 $^ -o $@
+cat: build/general.o build/cat.o
+	${LD} -Ln $@.lbl -t c128 $^ -o $@
 
-cat: src/general.o src/cat.o
-	${LD} -t c128 $^ -o $@
+charmap: build/print_charmap.o build/vdc_util.o build/vdc_patch_charset.o
+	${LD} -Ln $@.lbl -t c128 $^ -o $@
+
+ascii: build/print_ascii.o
+	${LD} -Ln $@.lbl -t c128 $^ -o $@
 
 package: all
-	cp images/kasse.d64 .
-	c1541 -attach kasse.d64 -delete state || exit 0 
-	c1541 -attach kasse.d64 -delete items || exit 0
-	c1541 -attach kasse.d64 -delete kasse || exit 0
-	c1541 -attach kasse.d64 -delete itemz || exit 0
-	c1541 -attach kasse.d64 -write kasse || exit 0
-	c1541 -attach kasse.d64 -write itemz || exit 0
-#	c1541 -attach kasse.d64 -write state || exit 0 
-#	c1541 -attach kasse.d64 -write items || exit 0
-
-test: src/config.o test/test.o src/general.o
-	cl65 -t c128 src/config.o test/test.o src/general.o -o test
+	c1541 -format "${GV}",KA d64 kasse.d64
+	c1541 -attach kasse.d64 -write kasse
+	c1541 -attach kasse.d64 -write itemz
+	[ -e state ] && c1541 -attach kasse.d64 -write state || exit 0
+	[ -e items ] && c1541 -attach kasse.d64 -write items || exit 0
+
+test: build/config.o test/test.o build/general.o
+	cl65 -t c128 $^ -o build/test
 
 test-package: test
-	c1541 -attach test.d64 -delete state || exit 0 
-	c1541 -attach test.d64 -delete items || exit 0
-	c1541 -attach test.d64 -delete test || exit 0
+	c1541 -format "test",TE d64 test.d64
 	c1541 -attach test.d64 -write test || exit 0
-	c1541 -attach test.d64 -write state || exit 0 
+	c1541 -attach test.d64 -write state || exit 0
 	c1541 -attach test.d64 -write items || exit 0
 
 clean:
-	rm -rf src/*.o src/*.s test/*.o test/*.s
+	rm -rf build/*.o build/*.s test/*.o test/*.s
 
 dist-clean: clean
-	rm kasse itemz kasse.d64
+	rm -f kasse kasse.lbl itemz itemz.lbl cat cat.lbl kasse.d64
+
+format:
+	clang-format-3.9 -i **/*.[ch]