diff --git a/Source/HBIOS/Build.cmd b/Source/HBIOS/Build.cmd index b5967ec5..c0a9fe0f 100644 --- a/Source/HBIOS/Build.cmd +++ b/Source/HBIOS/Build.cmd @@ -70,7 +70,7 @@ call :asm romldr || exit /b call :asm eastaegg || exit /b call :asm nascom || exit /b -call :asm tastybasic || exit /b +:: call :asm tastybasic || exit /b call :asm game || exit /b call :asm usrrom || exit /b call :asm updater || exit /b @@ -84,7 +84,7 @@ call :asm imgpad2 || exit /b :: copy /b romldr.bin + dbgmon.bin + ..\zsdos\zsys_wbw.bin + ..\cpm22\cpm_wbw.bin osimg.bin || exit /b -copy /b ..\Forth\camel80.bin + nascom.bin + tastybasic.bin + game.bin + eastaegg.bin + netboot.mod + updater.bin + usrrom.bin osimg1.bin || exit /b +copy /b ..\Forth\camel80.bin + nascom.bin + ..\tastybasic\src\tastybasic.bin + game.bin + eastaegg.bin + netboot.mod + updater.bin + usrrom.bin osimg1.bin || exit /b copy /b imgpad2.bin osimg2.bin || exit /b copy /b romldr.bin + dbgmon.bin + ..\zsdos\zsys_wbw.bin osimg_small.bin || exit /b diff --git a/Source/TastyBasic/src/Build.cmd b/Source/TastyBasic/src/Build.cmd index 5c0bc0ec..9ee76528 100644 --- a/Source/TastyBasic/src/Build.cmd +++ b/Source/TastyBasic/src/Build.cmd @@ -7,7 +7,7 @@ set PATH=%TOOLS%\tasm32;%PATH% set TASMTABS=%TOOLS%\tasm32 -tasm -80 -dROMWBW tastybasic.asm tastybasic.bin tastybasic.bin.lst -tasm -80 -dCPM tastybasic.asm tastybasic.com tastybasic.com.lst +tasm -80 -g3 -fFF -dROMWBW tastybasic.asm tastybasic.bin tastybasic.bin.lst +tasm -80 -g3 -fFF -dCPM tastybasic.asm tastybasic.com tastybasic.com.lst copy /b /v tastybasic.com ..\..\..\Binary\Apps\tbasic.com diff --git a/Source/TastyBasic/src/Clean.cmd b/Source/TastyBasic/src/Clean.cmd index 9d2d37a1..420369b5 100644 --- a/Source/TastyBasic/src/Clean.cmd +++ b/Source/TastyBasic/src/Clean.cmd @@ -7,5 +7,4 @@ if exist *.prn del *.prn if exist *.hex del *.hex if exist *.rel del *.rel if exist *.sym del *.sym - -if exist ..\..\..\Binary\Apps\tbasic.com del ..\..\..\Binary\Apps\tbasic.com +if exist *.com del *.com diff --git a/Source/TastyBasic/src/Makefile b/Source/TastyBasic/src/Makefile index 226bc02a..dbe3fae8 100644 --- a/Source/TastyBasic/src/Makefile +++ b/Source/TastyBasic/src/Makefile @@ -1,5 +1,5 @@ UNAME := $(shell uname) -VER := $(shell git describe --tags --abbrev=0) +# VER := $(shell git describe --tags --abbrev=0) APPDIR := $(wildcard ../../../Binary/Apps) BINDIR := ../../../Tools/$(UNAME) @@ -14,17 +14,21 @@ export PATH := $(BINDIR):${PATH} all: $(ROMIMAGE) $(CPMCMD) | $(APPDIR) -clean clobber: - @rm -f *.lst *.img *.com *.bin $(CPMAPP) +clean: + @rm -f *.lst *.img *.com *.bin + +clobber: clean + @rm -f $(CPMAPP) + $(ROMIMAGE): $(ROMDEPS) - @uz80as -dROMWBW -d"VERSION \"$(VER)\"" tastybasic.asm tastybasic.bin tastybasic.bin.lst + @uz80as -dROMWBW 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 $(CPMCMD): $(CPMDEPS) - @uz80as -dCPM -d"VERSION \"$(VER)\"" tastybasic.asm tastybasic.com tastybasic.com.lst + @uz80as -dCPM tastybasic.asm tastybasic.com tastybasic.com.lst $(APPDIR): $(CPMCMD) @cat $(CPMCMD) > $(CPMAPP) diff --git a/Source/ver.inc b/Source/ver.inc index 5797acd2..09a06696 100644 --- a/Source/ver.inc +++ b/Source/ver.inc @@ -2,4 +2,4 @@ #DEFINE RMN 1 #DEFINE RUP 1 #DEFINE RTP 0 -#DEFINE BIOSVER "3.1.1-pre.133" +#DEFINE BIOSVER "3.1.1-pre.134" diff --git a/Source/ver.lib b/Source/ver.lib index c13e585e..b86cd056 100644 --- a/Source/ver.lib +++ b/Source/ver.lib @@ -3,5 +3,5 @@ rmn equ 1 rup equ 1 rtp equ 0 biosver macro - db "3.1.1-pre.133" + db "3.1.1-pre.134" endm