X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=3d2eaa870d696464c41ae4b6b70d3c4b9f733568;hb=a08c19769773a15d276cee14ae66514bbec7510d;hp=fa5677e303ed1daed35460d8e8707f4913a0b61c;hpb=fc364e69259110b4d4aaca881217d19adbcfd8e4;p=c128-kasse

diff --git a/Makefile b/Makefile
index fa5677e..3d2eaa8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,56 +1,52 @@
-# 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
-#CA=~/customSoftware/cc65-2.11.0/src/ca65/ca65
-#CL=~/customSoftware/cc65-2.11.0/src/cl65/cl65
 CC=cc65
-CA=ca65
-CL=cl65
+AS=ca65
+LD=cl65
+INCLUDES:=$(wildcard include/*.h) include/version.h
+GV:=$(shell git describe --tags --always)
+CFLAGS= -I include -t c128 -g
 
-src/%.o: src/%.c include/%.h
-	${CC} -O -I include -t c128 $<
-	${CA} -I include -t c128 src/$$(basename $< .c).s
+.PHONY: include/version.h clean dist-clean format
 
-test/%.o: test/%.c
-	${CC} -O -I include -t c128 $<
-	${CA} -I include -t c128 test/$$(basename $< .c).s
+all: kasse itemz
 
-kasse: src/config.o src/kasse.o src/general.o src/credit_manager.o src/c128time.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 src/*.o -o kasse
+build/%.o: src/%.c ${INCLUDES}
+	${CC} ${CFLAGS} -O $< -o build/$(addsuffix .s,$(shell basename $< .c))
+	${AS} ${CFLAGS} build/$(addsuffix .s,$(shell basename $< .c)) -o $@
 
-itemz: src/config.o src/itemz.o src/general.o src/credit_manager.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 src/config.o src/itemz.o src/general.o src/credit_manager.o -o itemz
+include/version.h:
+	mkdir -p build
+	echo "#define GV \"${GV}\"" > $@
 
-all: kasse itemz
+kasse: build/config.o build/kasse.o build/general.o build/credit_manager.o build/c128time.o build/print.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 $@
 
 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
-	${CL} -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 -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 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 itemz kasse.d64
+
+format:
+	clang-format-3.9 -i **/*.[ch]