X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=40ab3c06c40431d5421ae3b86c0fbaae1ce68719;hb=6c92ac31b952e0baf683ae9f40200fcdc85fbaef;hp=af273eccc7e05b9bd7a6856c573b126623feea1c;hpb=91277a6a0f520ec37f71e41ee026fe1eaa9c233c;p=c128-kasse

diff --git a/Makefile b/Makefile
index af273ec..40ab3c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,53 +1,43 @@
-# 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
-
 src/%.o: src/%.c include/%.h
-	${CC} -O -I include -t c128 $<
-	${CA} -I include -t c128 src/$$(basename $< .c).s
+	cc65 -O -I include -t c128 $<
+	ca65 -I include -t c128 src/$$(basename $< .c).s
 
 test/%.o: test/%.c
-	${CC} -O -I include -t c128 $<
-	${CA} -I include -t c128 test/$$(basename $< .c).s
+	cc65 -O -I include -t c128 $<
+	ca65 -I include -t c128 test/$$(basename $< .c).s
 
 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
+	cl65 -t c128 src/c128time.o src/config.o src/kasse.o src/general.o src/credit_manager.o -o kasse
 
 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
+	cl65 -t c128 src/config.o src/itemz.o src/general.o src/credit_manager.o -o itemz
+
+cat: src/general.o src/cat.o
+	cl65 -t c128 src/general.o src/cat.o -o cat
 
 all: kasse itemz
 
 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 itemz  || 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: src/config.o test/test.o src/general.o
-	${CL} -t c128 src/config.o test/test.o src/general.o -o test
+	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 src/*.o src/*.s test/*.o test/*.s