diff --git a/Makefile b/Makefile index 85c5917..79d23ad 100644 --- a/Makefile +++ b/Makefile @@ -47,10 +47,10 @@ forth_t64_files = $(patsubst %, autostart-c64/%.T64, $(forth_binaries)) all: c64 c16 x16 etc -release: doc.zip \ - c64files.zip c64files.d64 \ - c16files.zip c16files.d64 \ - x16files.zip x16files-sdcard.zip +release: cc64-doc.zip \ + cc64-c64files.zip cc64-c64files.d64 \ + cc64-c16files.zip cc64-c16files.d64 \ + cc64-x16files.zip cc64-x16files-sdcard.zip rm -rf release mkdir release cp -p $^ release/ @@ -68,19 +68,19 @@ cc64-c64-t64: $(cc64_c64_t64_files) cc64-c16-t64: $(cc64_c16_t64_files) -c64files.zip: $(c64dir_files) +cc64-c64files.zip: $(c64dir_files) COPYING rm -f $@ - zip -r $@ $(c64dir_files) + zip -r $@ $^ -c16files.zip: $(c16dir_files) +cc64-c16files.zip: $(c16dir_files) COPYING rm -f $@ - zip -r $@ $(c16dir_files) + zip -r $@ $^ -x16files.zip: $(x16dir_files) +cc64-x16files.zip: $(x16dir_files) COPYING rm -f $@ - zip -r $@ $(x16dir_files) + zip -r $@ $^ -c64files.d64: $(c64dir_files) +cc64-c64files.d64: $(c64dir_files) tmp/copying rm -f $@ c1541 -format cc64-c64,cc d64 $@ c1541 -attach $@ $(patsubst %, -write c64files/%, $(cc64_binaries)) @@ -98,8 +98,9 @@ c64files.d64: $(c64dir_files) c1541 -attach $@ -write c64files/kernal-io-c64.c kernal-io-c64.c,s c1541 -attach $@ -write c64files/helloworld-c16.c helloworld-c16.c,s c1541 -attach $@ -write c64files/kernal-io-c16.c kernal-io-c16.c,s + c1541 -attach $@ -write tmp/copying -c16files.d64: $(c16dir_files) +cc64-c16files.d64: $(c16dir_files) tmp/copying rm -f $@ c1541 -format cc64-c16,cc d64 $@ c1541 -attach $@ $(patsubst %, -write c16files/%, $(cc64_binaries)) @@ -117,16 +118,18 @@ c16files.d64: $(c16dir_files) c1541 -attach $@ -write c16files/kernal-io-c64.c kernal-io-c64.c,s c1541 -attach $@ -write c16files/helloworld-c16.c helloworld-c16.c,s c1541 -attach $@ -write c16files/kernal-io-c16.c kernal-io-c16.c,s + c1541 -attach $@ -write tmp/copying -x16files-sdcard.zip: $(x16dir_files) emulator/copy-to-sd-img.sh \ - emulator/mk-sdcard.sh emulator/sdcard.sfdisk +cc64-x16files-sdcard.zip: $(x16dir_files) emulator/copy-to-sd-img.sh \ + emulator/mk-sdcard.sh emulator/sdcard.sfdisk tmp/copying rm -f x16files.img $@ emulator/mk-sdcard.sh emulator/sdcard.sfdisk x16files.img mformat -i x16files.img -F emulator/copy-to-sd-img.sh x16files.img $(x16dir_files) + mcopy -i x16files.img tmp/copying ::COPYING zip $@ x16files.img -doc.zip: $(wildcard *.md) +cc64-doc.zip: $(wildcard *.md) COPYING zip $@ $^ etc: $(forth_t64_files) emulator/c-char-rom-gen @@ -348,3 +351,7 @@ x16files/%.fth: src/*/%.fth x16files/%.c: src/*/%.c ascii2petscii $< $@ touch -r $< $@ + +tmp/copying: COPYING + test -d tmp || mkdir tmp + ascii2petscii $< $@ diff --git a/c16files.d64 b/cc64-c16files.d64 similarity index 98% rename from c16files.d64 rename to cc64-c16files.d64 index 87d9a49..6bdd099 100644 Binary files a/c16files.d64 and b/cc64-c16files.d64 differ diff --git a/c16files.zip b/cc64-c16files.zip similarity index 94% rename from c16files.zip rename to cc64-c16files.zip index c0c90ac..14b612c 100644 Binary files a/c16files.zip and b/cc64-c16files.zip differ diff --git a/c64files.d64 b/cc64-c64files.d64 similarity index 98% rename from c64files.d64 rename to cc64-c64files.d64 index 3642968..34e1cf2 100644 Binary files a/c64files.d64 and b/cc64-c64files.d64 differ diff --git a/c64files.zip b/cc64-c64files.zip similarity index 94% rename from c64files.zip rename to cc64-c64files.zip index 21a5603..3a1af9b 100644 Binary files a/c64files.zip and b/cc64-c64files.zip differ diff --git a/cc64-doc.zip b/cc64-doc.zip new file mode 100644 index 0000000..d65af03 Binary files /dev/null and b/cc64-doc.zip differ diff --git a/x16files-sdcard.zip b/cc64-x16files-sdcard.zip similarity index 70% rename from x16files-sdcard.zip rename to cc64-x16files-sdcard.zip index 3739a02..70732ad 100644 Binary files a/x16files-sdcard.zip and b/cc64-x16files-sdcard.zip differ diff --git a/x16files.zip b/cc64-x16files.zip similarity index 83% rename from x16files.zip rename to cc64-x16files.zip index 3e5b559..a7b3853 100644 Binary files a/x16files.zip and b/cc64-x16files.zip differ