diff --git a/Makefile b/Makefile index 94f04ee6..ceb43f6f 100644 --- a/Makefile +++ b/Makefile @@ -3,70 +3,80 @@ CFLAGS = -O2 -Wall LFLAGS = all: dos33 asoft_detoken mkdos33fs make_b tokenize_asoft \ - dos33_text2ascii integer_detoken char2hex pcx2hgr + dos33_text2ascii integer_detoken char2hex pcx2hgr \ + asoft_presenter -asoft_detoken: asoft_detoken.o - $(CC) $(LFLAGS) -o asoft_detoken asoft_detoken.o +asoft_detoken: asoft_detoken.o + $(CC) $(LFLAGS) -o asoft_detoken asoft_detoken.o -asoft_detoken.o: asoft_detoken.c - $(CC) $(CFLAGS) -c asoft_detoken.c - -integer_detoken: integer_detoken.o - $(CC) $(LFLAGS) -o integer_detoken integer_detoken.o +asoft_detoken.o: asoft_detoken.c + $(CC) $(CFLAGS) -c asoft_detoken.c -integer_detoken.o: integer_detoken.c - $(CC) $(CFLAGS) -c integer_detoken.c - -tokenize_asoft: tokenize_asoft.o - $(CC) $(LFLAGS) -o tokenize_asoft tokenize_asoft.o - -tokenize_asoft.o: tokenize_asoft.c - $(CC) $(CFLAGS) -c tokenize_asoft.c +asoft_presenter: asoft_presenter.o + $(CC) $(LFLAGS) -o asoft_presenter asoft_presenter.o +asoft_presenter.o: asoft_presenter.c + $(CC) $(CLFAGS) -c asoft_presenter.c -pcx2hgr: pcx2hgr.o - $(CC) $(LFLAGS) -o pcx2hgr pcx2hgr.o +integer_detoken: integer_detoken.o + $(CC) $(LFLAGS) -o integer_detoken integer_detoken.o -pcx2hgr.o: pcx2hgr.c - $(CC) $(CFLAGS) -c pcx2hgr.c +integer_detoken.o: integer_detoken.c + $(CC) $(CFLAGS) -c integer_detoken.c -char2hex: char2hex.o - $(CC) $(LFLAGS) -o char2hex char2hex.o +tokenize_asoft: tokenize_asoft.o + $(CC) $(LFLAGS) -o tokenize_asoft tokenize_asoft.o -char2hex.o: char2hex.c - $(CC) $(CFLAGS) -c char2hex.c +tokenize_asoft.o: tokenize_asoft.c + $(CC) $(CFLAGS) -c tokenize_asoft.c -dos33: dos33.o - $(CC) $(LFLAGS) -o dos33 dos33.o - -dos33.o: dos33.c dos33.h - $(CC) $(CFLAGS) -c dos33.c +pcx2hgr: pcx2hgr.o + $(CC) $(LFLAGS) -o pcx2hgr pcx2hgr.o -dos33_text2ascii: dos33_text2ascii.o - $(CC) $(LFLGAS) -o dos33_text2ascii dos33_text2ascii.o - -dos33_text2ascii.o: dos33_text2ascii.c - $(CC) $(CFLAGS) -c dos33_text2ascii.c +pcx2hgr.o: pcx2hgr.c + $(CC) $(CFLAGS) -c pcx2hgr.c -make_b: make_b.o - $(CC) $(LFLAGS) -o make_b make_b.o - -make_b.o: make_b.c - $(CC) $(CFLAGS) -c make_b.c - - -mkdos33fs: mkdos33fs.o - $(CC) $(LFLAGS) -o mkdos33fs mkdos33fs.o - -mkdos33fs.o: mkdos33fs.c dos33.h - $(CC) $(CFLAGS) -c mkdos33fs.c +char2hex: char2hex.o + $(CC) $(LFLAGS) -o char2hex char2hex.o + +char2hex.o: char2hex.c + $(CC) $(CFLAGS) -c char2hex.c + +dos33: dos33.o + $(CC) $(LFLAGS) -o dos33 dos33.o + +dos33.o: dos33.c dos33.h + $(CC) $(CFLAGS) -c dos33.c + +dos33_text2ascii: dos33_text2ascii.o + $(CC) $(LFLGAS) -o dos33_text2ascii dos33_text2ascii.o + +dos33_text2ascii.o: dos33_text2ascii.c + $(CC) $(CFLAGS) -c dos33_text2ascii.c + +make_b: make_b.o + $(CC) $(LFLAGS) -o make_b make_b.o + +make_b.o: make_b.c + $(CC) $(CFLAGS) -c make_b.c + +mkdos33fs: mkdos33fs.o + $(CC) $(LFLAGS) -o mkdos33fs mkdos33fs.o + +mkdos33fs.o: mkdos33fs.c dos33.h + $(CC) $(CFLAGS) -c mkdos33fs.c install: - cp dos33 asoft_detoken mkdos33fs tokenize_asoft make_b dos33_text2ascii integer_detoken /usr/local/bin + cp dos33 asoft_detoken mkdos33fs tokenize_asoft make_b \ + dos33_text2ascii integer_detoken /usr/local/bin clean: - rm -f *~ *.o asoft_detoken dos33 make_b mkdos33fs tokenize_asoft dos33_text2ascii integer_detoken char2hex pcx2hgr + rm -f *~ *.o asoft_detoken dos33 make_b mkdos33fs \ + tokenize_asoft dos33_text2ascii integer_detoken \ + char2hex pcx2hgr asoft_presenter cd tests && make clean + cd presenter_demo && make clean + diff --git a/README b/README index 75c96cc4..2e93da41 100644 --- a/README +++ b/README @@ -1,4 +1,6 @@ +%%%%%%%%%%%% dos33fsprogs +%%%%%%%%%%%% http://www.deater.net/weave/vmwprod/apple/dos33fs.html @@ -8,21 +10,74 @@ dos33fsprogs These are some tools for manipulating Apple II disk files that I've written over the years while doing Apple 2 hacking. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + make_b : take a machine language blob and give it the size/offset header needed to BLOAD it from DOS3.3 + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + asoft_detoken: takes an applesoft file obtained with dos33 and converts it to an ASCII text file + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + tokenize_asoft: takes an ASCII text file and converts it into a tokenized applesoft file - + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + dos33: a tool for manipulating dos33 .dsk images + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + dos33_text2ascii: convert a dos33 text file to ASCII + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + integer_detoken: detokenize an Apple Integer BASIC program + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + pcx2hgr: converts a 140x160 (or 140x192) PCX image file into an Apple II HGR graphics file that can be loaded with "BLOAD IMAGE,A$2000" + + To get it to work, create an image with the GIMP. + Scale to 140x160. Save as indexed with the + included "hgr.pal" palette. + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +mkdos33fs: create an Apple ][ DOS 3.3 filesystems + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +asoft_presenter: + + creates a slide presentation disk image for use on apple II + + + ARGH programming in C too long can't handle things that start + numbering with "1" rather than "0". + + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/asoft_presenter/generate_presentation.c b/asoft_presenter.c similarity index 100% rename from asoft_presenter/generate_presentation.c rename to asoft_presenter.c diff --git a/asoft_presenter/Makefile b/asoft_presenter/Makefile deleted file mode 100644 index 5485fe55..00000000 --- a/asoft_presenter/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -CC = gcc -CFLAGS = -O2 -Wall -LFLAGS = - - -all: test.dsk - -test.dsk: TEST VINCE.IMG - ../dos33 test.dsk SAVE A TEST - ../dos33 test.dsk SAVE B VINCE.IMG - - -VINCE.IMG: vince.pcx ../pcx2hgr - ../pcx2hgr vince.pcx > VINCE.IMG - -TEST: test.bas - ../tokenize_asoft < test.bas > TEST - -test.bas: generate_presentation - ./generate_presentation test > test.bas - -generate_presentation: generate_presentation.o - $(CC) $(LFLAGS) -o generate_presentation generate_presentation.o - -generate_presentations.o: generate_presentation.c - $(CC) $(CFLAGS) -c generate_presentation.c - -clean: - rm -f *~ *.o generate_presentation - diff --git a/asoft_presenter/hgr.pal b/hgr.pal similarity index 100% rename from asoft_presenter/hgr.pal rename to hgr.pal diff --git a/presenter_demo/Makefile b/presenter_demo/Makefile new file mode 100644 index 00000000..3a71c048 --- /dev/null +++ b/presenter_demo/Makefile @@ -0,0 +1,23 @@ +CC = gcc +CFLAGS = -O2 -Wall +LFLAGS = + +all: presenter_demo.dsk + +presenter_demo.dsk: TEST VINCE.IMG + ../dos33 presenter_demo.dsk SAVE A TEST + ../dos33 presenter_demo.dsk SAVE B VINCE.IMG + + +VINCE.IMG: vince.pcx ../pcx2hgr + ../pcx2hgr vince.pcx > VINCE.IMG + +TEST: test.bas + ../tokenize_asoft < test.bas > TEST + +test.bas: ../asoft_presenter + ../asoft_presenter . > test.bas + +clean: + rm -f *~ *.IMG *.bas + diff --git a/asoft_presenter/test/footer b/presenter_demo/footer similarity index 100% rename from asoft_presenter/test/footer rename to presenter_demo/footer diff --git a/asoft_presenter/test/info b/presenter_demo/info similarity index 100% rename from asoft_presenter/test/info rename to presenter_demo/info diff --git a/asoft_presenter/test.dsk b/presenter_demo/presenter_demo.dsk similarity index 55% rename from asoft_presenter/test.dsk rename to presenter_demo/presenter_demo.dsk index bc6750e0..d27c6e40 100644 Binary files a/asoft_presenter/test.dsk and b/presenter_demo/presenter_demo.dsk differ diff --git a/asoft_presenter/test/slide0 b/presenter_demo/slide0 similarity index 100% rename from asoft_presenter/test/slide0 rename to presenter_demo/slide0 diff --git a/asoft_presenter/test/slide1 b/presenter_demo/slide1 similarity index 100% rename from asoft_presenter/test/slide1 rename to presenter_demo/slide1 diff --git a/asoft_presenter/test/slide2 b/presenter_demo/slide2 similarity index 100% rename from asoft_presenter/test/slide2 rename to presenter_demo/slide2 diff --git a/asoft_presenter/test/slide3 b/presenter_demo/slide3 similarity index 100% rename from asoft_presenter/test/slide3 rename to presenter_demo/slide3