Merge remote-tracking branch 'upstream/dev' into dev

Binary/Makefile

@@ -5,9 +5,9 @@ SUBDIRS = Apps CPM3 ZPM3
 include $(TOOLS)/Makefile.inc
 
 clean::
-	@rm -f *.bin *.com *.img *.rom
+	@rm -f *.bin *.com *.img *.rom *.upd
 
 clobber:: clean
-	@rm -f *.upd *.hex *.pdf *.log *.eeprom *.dat
+	@rm -f *.hex *.pdf *.log *.eeprom *.dat
 
 .PHONEY: clean clobber

Source/Images/d_bp.txt

@@ -21,6 +21,7 @@
 ../../Binary/Apps/syscopy.com 15:
 ../../Binary/Apps/sysgen.com 15:
 ../../Binary/Apps/talk.com 15:
+../../Binary/Apps/tbasic.com 0:
 ../../Binary/Apps/timer.com 15:
 ../../Binary/Apps/tune.com 15:
 ../../Binary/Apps/xm.com 15:

Source/Images/d_cpm3.txt

@@ -33,6 +33,7 @@
 ../../Binary/Apps/syscopy.com 0:
 #../../Binary/Apps/sysgen.com 0:
 #../../Binary/Apps/talk.com 0:
+../../Binary/Apps/tbasic.com 0:
 ../../Binary/Apps/timer.com 0:
 ../../Binary/Apps/tune.com 0:
 ../../Binary/Apps/xm.com 0:

Source/Images/d_nzcom.txt

@@ -34,6 +34,7 @@ d_zsdos/u0/*.* 0:
 ../../Binary/Apps/syscopy.com 0:
 ../../Binary/Apps/sysgen.com 0:
 ../../Binary/Apps/talk.com 0:
+../../Binary/Apps/tbasic.com 0:
 ../../Binary/Apps/timer.com 0:
 ../../Binary/Apps/tune.com 0:
 ../../Binary/Apps/xm.com 0:

Source/Images/d_zpm3.txt

@@ -32,6 +32,7 @@
 ../../Binary/Apps/syscopy.com 15:
 ../../Binary/Apps/sysgen.com 15:
 ../../Binary/Apps/talk.com 15:
+../../Binary/Apps/tbasic.com 0:
 ../../Binary/Apps/timer.com 15:
 ../../Binary/Apps/tune.com 15:
 ../../Binary/Apps/xm.com 15:

Source/TastyBasic/Makefile

@@ -1,9 +1,3 @@
-SUBDIRS := src
-TARGETS := all clobber clean
-
-$(TARGETS): $(SUBDIRS)
-
-$(SUBDIRS):
-	$(MAKE) -C $@ $(MAKECMDGOALS)
-
-.PHONY: $(TARGETS) $(SUBDIRS)
+SUBDIRS = src
+TOOLS = ../../Tools
+include $(TOOLS)/Makefile.inc

Source/TastyBasic/src/Makefile

@@ -1,37 +1,18 @@
-# git@github.com:dimitrit/tastybasic.git; commit a86d7e7; (HEAD -> master, tag: v0.3.0) 
-VER := \"v0.3.0\" 
-UNAME := $(shell uname)
-APPDIR := $(wildcard ../../../Binary/Apps)
-BINDIR := ../../../Tools/$(UNAME)
-
-ROMIMAGE := tastybasic.bin
-ROMDEPS := tastybasic.asm romwbwio.asm
-CPMCMD := tastybasic.com
-CPMDEPS := tastybasic.asm cpmio.asm
-CPMAPP := $(APPDIR)/tbasic.com
-CPMIMAGE := tastybasic.img
-
-export PATH := $(BINDIR):${PATH}
-
-all: $(ROMIMAGE) $(CPMCMD) | $(APPDIR)
+OBJECTS = tastybasic.bin tbasic.com
+TOOLS = ../../../Tools
+OTHERS = *.com
+APPDIR=../../../Binary/Apps
 
-clean:
-	@rm -f *.lst *.img *.com *.bin
+include $(TOOLS)/Makefile.inc
 
-clobber: clean
-	@rm -f $(CPMAPP)
-
-$(ROMIMAGE): $(ROMDEPS)
-	@uz80as -dROMWBW -d"VERSION $(VER)" tastybasic.asm tastybasic.bin tastybasic.bin.lst
-
-$(CPMIMAGE): $(CPMCMD)
-	@mkfs.cpm -f wbw_fd144 tastybasic.img
-	@cpmcp -f wbw_fd144 tastybasic.img tastybasic.com 0:tbasic.com
+# git@github.com:dimitrit/tastybasic.git; commit a86d7e7; (HEAD -> master, tag: v0.3.0) 
+VER=\"v0.3.0\" 
+USETASM=1
 
-$(CPMCMD): $(CPMDEPS)
-	@uz80as -dCPM -d"VERSION $(VER)" tastybasic.asm tastybasic.com tastybasic.com.lst
+tastybasic.bin: TASMFLAGS=-dROMWBW -d"VERSION $(VER)"
 
-$(APPDIR): $(CPMCMD)
-	@cat $(CPMCMD) > $(CPMAPP)
+tastybasic.com: TASMFLAGS=-dCPM -d"VERSION $(VER)"
 
-.PHONY: clean clobber $(APPDIR)
+tbasic.com : tastybasic.com
+	cp $< $@
+	cp $$($(CASEFN) $@) $(APPDIR)

Source/ver.inc

@@ -2,4 +2,4 @@
 #DEFINE	RMN	1
 #DEFINE	RUP	1
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"3.1.1-pre.134"
+#DEFINE BIOSVER	"3.1.1-pre.135"

Source/ver.lib

@@ -3,5 +3,5 @@ rmn	equ	1
 rup	equ	1
 rtp	equ	0
 biosver	macro
-	db	"3.1.1-pre.134"
+	db	"3.1.1-pre.135"
 	endm