Browse Source

clean, identical build. font source generator emitted .align. this does not match the windows build

pull/86/head
curt mayer 6 years ago
parent
commit
621083947c
  1. 2
      Source/HBIOS/Build.sh
  2. 44
      Source/HBIOS/Makefile
  3. 3
      Tools/Makefile.inc
  4. 2
      Tools/unix/bin2asm/bin2asm.c

2
Source/HBIOS/Build.sh

@ -46,7 +46,7 @@ fi
Apps=(assign fdu format mode osldr rtc survey syscopy sysgen talk timer xm inttest)
timestamp=$(date +%Y-%m-%d)
timestamp="2020-02-20"
#timestamp="2020-02-24"
blankfile=Blank${romsize}KB.dat
romdiskfile=RomDisk.tmp

44
Source/HBIOS/Makefile

@ -1,4 +1,26 @@
OBJECTS = ZETA2_std.rom # N8_std.rom SBC_std.rom
OBJECTS =
ifeq (1,0)
OBJECTS += DYNO_std.rom
OBJECTS += EZZ80_std.rom
OBJECTS += MK4_std.rom
OBJECTS += N8_std.rom
OBJECTS += RCZ180_ext.rom
OBJECTS += RCZ180_nat.rom
OBJECTS += RCZ80_kio.rom
OBJECTS += RCZ80_mt.rom
OBJECTS += RCZ80_std.rom
OBJECTS += RCZ80_wiz.rom
OBJECTS += SBC_simh.rom
OBJECTS += SBC_std.rom
OBJECTS += SCZ180_126.rom
OBJECTS += SCZ180_130.rom
OBJECTS += UNA_std.rom
OBJECTS += ZETA_std.rom
endif
OBJECTS += ZETA2_std.rom
MOREDIFF = camel80.bin game.bin hbios_rom.bin nascom.bin prefix.bin usrrom.bin \
dbgmon.bin hbios_app.bin imgpad0.bin osimg1.bin romldr.bin \
eastaegg.bin hbios_img.bin imgpad.bin osimg.bin tastybasic.bin \
@ -7,14 +29,14 @@ MOREDIFF = camel80.bin game.bin hbios_rom.bin nascom.bin prefix.bin usrrom.bin \
SUBDIRS =
DEST = ../../Binary
TOOLS =../../Tools
OTHERS = *.bin *.z80 cpm.sys zsys.sys Build.inc
OTHERS = *.img *.rom *.com *.bin *.z80 cpm.sys zsys.sys Build.inc
include $(TOOLS)/Makefile.inc
DIFFPATH = $(DIFFTO)/Binary
ROMSIZE=512
N8_std.rom: ROMSIZE=1024
N8_std.rom: ROMSIZE=512
%.rom:
bash Build.sh $(shell echo $* | tr '_' ' ') $(ROMSIZE)
@ -23,11 +45,19 @@ N8_std.rom: ROMSIZE=1024
# bash Build.sh ZETA2 std 512
hbios_rom.bin: hbios.asm build.inc
$(TASM) -dROMBOOT hbios.asm hbios_rom.bin
$(TASM) -dROMBOOT hbios.asm hbios_rom.bin hbios_rom.lst
hbios_app.bin: hbios.asm build.inc
$(TASM) -dAPPBOOT hbios.asm hbios_app.bin
$(TASM) -dAPPBOOT hbios.asm hbios_app.bin hbios_app.lst
hbios_img.bin: hbios.asm build.inc
$(TASM) -dIMGBOOT hbios.asm hbios_img.bin
$(TASM) -dIMGBOOT hbios.asm hbios_img.bin hbios_img.lst
romldr.bin: build.inc
dbgmon.bin: build.inc
nascom.bin: build.inc
dumps:
for i in $(MOREDIFF) ; do \
hexdump -C $$i >$$i.dump ; \
done

3
Tools/Makefile.inc

@ -165,4 +165,7 @@ ifneq ($(DIFFTO),)
fi ; \
done
endif
vdiff:
make VERBOSEDIFF=2 diff

2
Tools/unix/bin2asm/bin2asm.c

@ -34,9 +34,11 @@ int main(int argc, char *argv[]) {
}
// print header
#ifdef notdef
printf(" .section .rodata\r\n");
printf(" .global %s\r\n", name);
printf(" .align 2\r\n\r\n");
#endif
printf("%s:\r\n\r\n", name);
// write lines

Loading…
Cancel
Save