X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=1df105e47f6445f124df0ea960ae096f60f564eb;hb=b6fc2f7cbcd8bd7cb5aa9e83a358a91cc0396158;hp=3bc90446f6b7cd301741a3349c03887f164215db;hpb=b3993f4d0b664f190982b71290500f5577b113af;p=c128-kasse

diff --git a/Makefile b/Makefile
index 3bc9044..1df105e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,43 +1,64 @@
-# Note: this are my paths to cc65 as there is no gentoo ebuild, sorry for that.
-# Please use the path below if you've installed cc65 system-wide
-CC=~/customSoftware/cc65-2.11.0/src/cc65/cc65 -I ~/customSoftware/cc65-2.11.0/include -O
-CA=~/customSoftware/cc65-2.11.0/src/ca65/ca65
-CL=~/customSoftware/cc65-2.11.0/src/cl65/cl65
-# CC=cc65
-# CA=ca65
-# CL=cl65
-
-%.o: %.c
-	${CC} -t c128 $<
-	${CA} -t c128 $$(basename $< .c).s
-
-all: config.o kasse.o general.o credit_manager.o time.o
-	# See above, please just kill the PATH-definition
-	cp /tmp/cc65/lib/c128* .
-	PATH=${PATH}:~/customSoftware/cc65-2.11.0/src/ld65:/tmp/cc65/lib ${CL} -t c128 *.o -o kasse
+CC=cc65
+AS=ca65
+LD=cl65
+INCLUDES:=$(wildcard include/*.h) include/version.h include/charset_umlauts.h
+GV:=$(shell git describe --tags --always)
+CFLAGS= -I include -t c128 -g
+
+.PHONY: include/version.h include/charset_umlauts.h clean dist-clean format
+
+all: kasse itemz cat
+
+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}\"" > $@
+
+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 $@
+
+cat: build/general.o build/cat.o
+	${LD} -Ln $@.lbl -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
-	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 -write kasse  || exit 0
-	c1541 -attach kasse.d64 -write state || exit 0 
-	c1541 -attach kasse.d64 -write items  || exit 0
+	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: config.o test.o general.o
-	${CL} -t c128 config.o test.o general.o -o test
+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 -attach test.d64 -write test  || exit 0
-	c1541 -attach test.d64 -write state || exit 0 
-	c1541 -attach test.d64 -write items  || 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 items || exit 0
 
 clean:
-	rm -rf *.o *.s
-	
+	rm -rf build/*.o build/*.s test/*.o test/*.s
+
 dist-clean: clean
-	rm kasse test 
-	
+	rm -f kasse kasse.lbl itemz itemz.lbl cat cat.lbl kasse.d64
+
+format:
+	clang-format-3.9 -i **/*.[ch]