diff --git a/.gitignore b/.gitignore index 9421102..347e4a4 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ Release/ # Mac .DS_Store + +_FileInformation.txt diff --git a/Makefile b/Makefile index 6e3a35f..3efaad2 100644 --- a/Makefile +++ b/Makefile @@ -5,22 +5,34 @@ ifeq ($(OS),Windows_NT) MERLIN_LIB=$(MERLIN_DIR)/Library MERLIN=$(MERLIN_DIR)/Windows/Merlin32 RM=del /s + COPY=copy + APPLEWIN="c:\opt\AppleWin1.26.2.3\applewin.exe" else MERLIN_DIR=$(HOME)/opt/Merlin32_v1.0 MERLIN_LIB=$(MERLIN_DIR)/Library MERLIN=$(MERLIN_DIR)/Linux64/Merlin32 RM=rm -f + COPY=cp + APPLEWIN=applewin endif -AC=java -jar AppleCommander-*.jar +AC=java -jar AppleCommander-ac-1.4.0.jar SRC=online.s -PGM=ONLINE +PGM=online +BASE_DSK=prodos-2.0.3-boot.dsk VOL=$(PGM) DSK=$(PGM).dsk +# There is some kind of problem with turning this into a boot disk +# after it is created by AppleCommander. So, copy an existing boot +# disk instead. +#$(AC) -pro140 $(DSK) $(VOL) + $(DSK): $(PGM) - $(AC) -pro140 $(DSK) $(VOL) + $(COPY) $(BASE_DSK) $(DSK) + $(AC) -n $(DSK) $(VOL) $(AC) -p $(DSK) $(PGM) SYS < $(PGM) + cat $(PGM).VER.bas | tr '\n' '\r' | $(AC) -p $(DSK) $(PGM).VER TXT $(PGM): $(SRC) $(MERLIN) $(MERLIN_LIB) $(SRC) @@ -28,3 +40,6 @@ $(PGM): $(SRC) clean: $(RM) $(DSK) $(PGM) +test: $(DSK) + $(APPLEWIN) -d1 $(DSK) + diff --git a/_FileInformation.txt b/_FileInformation.txt new file mode 100644 index 0000000..9c7c5ff --- /dev/null +++ b/_FileInformation.txt @@ -0,0 +1 @@ +online=Type(00),AuxType(0000),VersionCreate(70),MinVersion(BE),Access(E3),FolderInfo1(000000000000000000000000000000000000),FolderInfo2(000000000000000000000000000000000000) diff --git a/online.s b/online.s index 8b64b1b..4b594e4 100644 --- a/online.s +++ b/online.s @@ -19,7 +19,7 @@ **************************************************************************** ORG $2000 - DSK ONLINE + DSK online TYP $FF ;SYSTEM TYPE ******************************** diff --git a/online.ver.bas b/online.ver.bas new file mode 100644 index 0000000..36bb973 --- /dev/null +++ b/online.ver.bas @@ -0,0 +1,17 @@ +10 REM PRINT ONLINE VERSION +20 REM +23 REM SAVE LOCATION 6 +25 LET M6=PEEK(6) +27 REM +30 REM PUT "V" FLAG FOR "VERSION" +40 REM INTO MEMORY LOCATION 6 +50 REM WHERE THE ONLINE PROGRAM +60 REM WILL LOOK FOR IT. +70 POKE 6, ASC("V") +80 REM +90 REM RUN THE PROGRAM +100 PRINT CHR$(4);"-ONLINE" +110 REM +120 REM RESTORE THE MEMORY LOCATION +130 POKE 6,M6 +140 END diff --git a/prodos-2.0.3-boot.dsk b/prodos-2.0.3-boot.dsk new file mode 100644 index 0000000..6a298ca Binary files /dev/null and b/prodos-2.0.3-boot.dsk differ