From 2f5a64b4bcf3c12671df4783676886b61633f171 Mon Sep 17 00:00:00 2001 From: sECuRE Date: Fri, 14 Nov 2008 23:20:40 +0000 Subject: [PATCH] Use unlink() instead of _sysremove(), cleanup makefile git-svn-id: https://shell.noname-ev.de/svn/kasse/c128@81 af93e077-1a23-4f1e-9cbe-9382a9d578f5 --- Makefile | 33 ++++++++++++--------------------- src/config.c | 7 ++++--- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index ba5932a..c957d26 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,3 @@ -# 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 @@ -16,14 +11,10 @@ test/%.o: test/%.c ${CA} -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/c128time.o src/config.o src/kasse.o src/general.o src/credit_manager.o -o kasse + ${CL} -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 + ${CL} -t c128 src/config.o src/itemz.o src/general.o src/credit_manager.o -o itemz cat: src/general.o src/cat.o ${CL} -t c128 src/general.o src/cat.o -o cat @@ -33,24 +24,24 @@ 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 kasse || exit 0 - c1541 -attach kasse.d64 -write itemz || 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 +# 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 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 diff --git a/src/config.c b/src/config.c index a094c05..b1e6a58 100644 --- a/src/config.c +++ b/src/config.c @@ -11,13 +11,14 @@ #include #include #include +#include #include "kasse.h" #include "general.h" #include "config.h" /* undocumented function which scratches files */ -unsigned char __fastcall__ _sysremove(const char *name); +//unsigned char __fastcall__ _sysremove(const char *name); unsigned long int money = 0; unsigned long int items_sold = 0; @@ -68,14 +69,14 @@ void load_credits() { void save_items() { if (items_exists) - _sysremove("items"); + unlink("items"); cbm_save("items", (BYTE)8, &status, sizeof(struct status_array_t)); items_exists = true; } void save_credits() { if (credits_exists) - _sysremove("credits"); + unlink("credits"); cbm_save("credits", (BYTE)8, &credits, sizeof(struct credits_array_t)); credits_exists = true; } -- 2.39.2