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

diff --git a/Makefile b/Makefile
index 3bc9044..cea7061 100644
--- a/Makefile
+++ b/Makefile
@@ -1,43 +1,48 @@
-# 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)
+GV:=$(shell git describe --tags --always)
+
+CFLAGS += -DGV=\"${GV}\"
+
+%.o: %.c ${INCLUDES}
+	${CC} ${CFLAGS} -O -I include -t c128 $< -o /dev/stdout | ${AS} -I include -t c128 /dev/stdin -o $@
+all: kasse itemz
+
+kasse: src/config.o src/kasse.o src/general.o src/credit_manager.o src/c128time.o src/print.o
+	${LD} -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: src/general.o src/cat.o
+	${LD} -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 -write kasse  || exit 0
-	c1541 -attach kasse.d64 -write state || exit 0 
-	c1541 -attach kasse.d64 -write items  || 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: config.o test.o general.o
-	${CL} -t c128 config.o test.o general.o -o test
+test: src/config.o test/test.o src/general.o
+	cl65 -t c128 src/config.o test/test.o src/general.o -o 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 -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 -attach test.d64 -write items || exit 0
 
 clean:
-	rm -rf *.o *.s
+	rm -rf src/*.o src/*.s test/*.o test/*.s
 	
 dist-clean: clean
-	rm kasse test 
-	
+	rm kasse itemz kasse.d64