2
0
Fork 0

Updated to lastest msxbuild

This commit is contained in:
Willem Cazander 2020-12-23 18:36:09 +01:00
parent 59b4c71fad
commit ca8f575d2d
26 changed files with 118 additions and 224 deletions

View file

@ -6,15 +6,16 @@ BIOS_HEX := $(BIOS_BIN)/$(BIOS_NAME).hex
BIOS_DAT := $(BIOS_BIN)/$(BIOS_NAME).dat
BIOS_RELS := $(BIOS_BIN)/$(BIOS_NAME).rel
BIOS_CODE := $(BIOS_SRC)/$(BIOS_NAME).asm
BUILD_HELP += \\n\\t* $(BIOS_DAT)
$(BIOS_BIN):
$(call mod_mkdir,$(BIOS_BIN))
$(call mb_mkdir,$(BIOS_BIN))
$(BIOS_BIN)/%.rel: $(BIOS_SRC)/%.asm | $(BIOS_BIN)
$(call mod_compile_asm,$@,$<)
$(call mb_compile_asm,$@,$<)
$(BIOS_HEX): $(BIOS_RELS)
$(call mod_link_asm_dos,$(BIOS_HEX),$(BIOS_RELS))
$(call mb_link_asm_dos,$(BIOS_HEX),$(BIOS_RELS))
$(BIOS_DAT): $(BIOS_HEX)
$(call mod_hex2dat,$(BIOS_HEX),$(BIOS_DAT))
$(call mb_hex2dat,$(BIOS_HEX),$(BIOS_DAT))

View file

@ -4,9 +4,10 @@ DIST_RUN_BIN := $(PATH_BIN)/$(DIST_RUN_NAME)
DIST_RUN_SRC := $(PATH_SRC)/$(DIST_RUN_NAME)
DIST_RUN_INC := autoexec.bat init.com dome.000
DIST_RUN_INC_BIN := $(patsubst %,$(DIST_RUN_BIN)/%,$(DIST_RUN_INC))
BUILD_HELP += \\n\\t* $(DIST_RUN_NAME)
$(DIST_RUN_BIN):
$(call mod_mkdir,$(DIST_RUN_BIN))
$(call mb_mkdir,$(DIST_RUN_BIN))
$(DIST_RUN_BIN)/autoexec.bat: $(DIST_RUN_SRC)/autoexec.bat | $(DIST_RUN_BIN)
unix2dos -n $< $@;
@ -21,4 +22,4 @@ $(DIST_RUN_BIN)/dome.000: bin/domelib/dome.000 | $(DIST_RUN_BIN)
$(DIST_RUN_NAME): $(DIST_RUN_INC_BIN)
$(call run_openmsx_dos2, $(DIST_RUN_BIN))
$(call mb_openmsx_dos2,$(DIST_RUN_BIN))

View file

@ -2,7 +2,7 @@ mode 80
echo === Set fail_after
omsxctl fail_after 300 realtime dist_run 4
echo === Set renderer
omsxctl set renderer SDL
omsxctl unset renderer
echo === Enable throttling
omsxctl set throttle on
echo === Start program

BIN
src/dist/WAVEDRV.COM vendored Executable file

Binary file not shown.

BIN
src/dist/WAVER800.DRV vendored Executable file

Binary file not shown.

BIN
src/dist/WAVEZ80X.DRV vendored Executable file

Binary file not shown.

BIN
src/dist/menu.zop vendored Executable file

Binary file not shown.

BIN
src/dist/unittot.zop vendored Executable file

Binary file not shown.

View file

@ -6,17 +6,18 @@ DOME_HEX := $(DOME_BIN)/$(DOME_NAME).hex
DOME_DAT := $(DOME_BIN)/$(DOME_NAME).dat
DOME_RELS := $(DOME_BIN)/$(DOME_NAME).rel
DOME_CODE := $(DOME_SRC)/$(DOME_NAME).asm
BUILD_HELP += \\n\\t* $(DOME_DAT)
# TODO fix build trigger on ai_new.asm
$(DOME_BIN):
$(call mod_mkdir,$(DOME_BIN))
$(call mb_mkdir,$(DOME_BIN))
$(DOME_BIN)/%.rel: $(DOME_SRC)/%.asm | $(DOME_BIN)
$(call mod_compile_asm,$@,$<)
$(call mb_compile_asm,$@,$<)
$(DOME_HEX): $(DOME_RELS)
$(call mod_link_asm_8000,$(DOME_HEX),$(DOME_RELS))
$(call mb_link_asm_8000,$(DOME_HEX),$(DOME_RELS))
$(DOME_DAT): $(DOME_HEX)
$(call mod_hex2dat,$(DOME_HEX),$(DOME_DAT))
$(call mb_hex2dat,$(DOME_HEX),$(DOME_DAT))

View file

@ -10,10 +10,10 @@ $(PATH_BIN)/loader/loader.dat \
$(PATH_BIN)/makelib/makelib.com \
$(PATH_BIN)/menu/menu.dat \
$(PATH_BIN)/mmenu/mmenu.dat
BUILD_HELP += \\n\\t* $(DOMELIB_OUT)
$(DOMELIB_BIN):
$(call mod_mkdir,$(DOMELIB_BIN))
$(call mb_mkdir,$(DOMELIB_BIN))
$(DOMELIB_BIN)/autoexec.bat: $(DOMELIB_SRC)/autoexec.bat | $(DOMELIB_BIN)
unix2dos -n $< $@;
@ -39,4 +39,4 @@ $(DOMELIB_BIN)/mmenu.dat: $(PATH_BIN)/mmenu/mmenu.dat | $(DOMELIB_BIN)
$(DOMELIB_OUT): $(DOMELIB_BIN)/autoexec.bat \
$(DOMELIB_BIN)/bios.dat $(DOMELIB_BIN)/dome.dat $(DOMELIB_BIN)/loader.dat $(DOMELIB_BIN)/makelib.com $(DOMELIB_BIN)/menu.dat $(DOMELIB_BIN)/mmenu.dat
cp $(DOMELIB_BIN)/autoexec.bat $(DOMELIB_OUT)
$(call run_openmsx_dos2, $(DOMELIB_BIN))
$(call mb_run_openmsx_dos2, $(DOMELIB_BIN))

View file

@ -4,9 +4,11 @@ GFX_SRC := $(PATH_SRC)/$(GFX_NAME)
GFX_BIN := $(PATH_BIN)/$(GFX_NAME)
GFX_SRC_FILES := $(call rwildcard, $(PATH_SRC)/$(GFX_NAME), *.ge5)
GFX_BIN_FILES := $(patsubst $(PATH_SRC)/$(GFX_NAME)/%.ge5,$(GFX_BIN)/%.zop,$(GFX_SRC_FILES))
BUILD_HELP += \\n\\t* gfx / test-gfx
$(GFX_BIN):
$(call mod_mkdir,$(GFX_BIN))
$(call mb_mkdir,$(GFX_BIN))
# TODO: add unittot.ge5
@ -21,26 +23,29 @@ $(GFX_BIN):
$(GFX_BIN)/%.zop: $(GFX_SRC)/%.ge5 | $(GFX_BIN)
cp $< $@;
unix2dos -n $(GFX_SRC)/autoexec.bat $(GFX_BIN)/autoexec.bat;
echo "basic conv.bas\r" >> $(GFX_BIN)/autoexec.bat;
@echo "basic conv.bas\r" >> $(GFX_BIN)/autoexec.bat;
echo "10 SCREEN 5 : SETPAGE 1,1\r" > $(GFX_BIN)/conv.bas;
echo "20 BLOAD\"$(notdir $@)\",S : COLOR=RESTORE\r" >> $(GFX_BIN)/conv.bas;
echo "30 BSAVE\"$(notdir $@)\",&H0000,&H7FFF,S\r" >> $(GFX_BIN)/conv.bas;
echo "40 _SYSTEM(\"pop.bat\")\r" >> $(GFX_BIN)/conv.bas;
@echo "10 SCREEN 5 : SETPAGE 1,1\r" > $(GFX_BIN)/conv.bas;
@echo "20 BLOAD\"$(notdir $@)\",S : COLOR=RESTORE\r" >> $(GFX_BIN)/conv.bas;
@echo "30 BSAVE\"$(notdir $@)\",&H0000,&H7FFF,S\r" >> $(GFX_BIN)/conv.bas;
@echo "40 _SYSTEM(\"pop.bat\")\r" >> $(GFX_BIN)/conv.bas;
echo "\r" > $(GFX_BIN)/pop.bat;
echo "mode 80\r" >> $(GFX_BIN)/pop.bat;
echo "popcom $(notdir $@)\r" >> $(GFX_BIN)/pop.bat;
echo "echo \"All done..................\"\r" >> $(GFX_BIN)/pop.bat;
echo "omsxctl exit\r" >> $(GFX_BIN)/pop.bat;
$(call run_openmsx_dos2, $(GFX_BIN))
@echo "\r" > $(GFX_BIN)/pop.bat;
@echo "mode 80\r" >> $(GFX_BIN)/pop.bat;
@echo "popcom $(notdir $@)\r" >> $(GFX_BIN)/pop.bat;
@echo "echo \"All done..................\"\r" >> $(GFX_BIN)/pop.bat;
@echo "omsxctl exit\r" >> $(GFX_BIN)/pop.bat;
$(call mb_run_openmsx_dos2, $(GFX_BIN))
ls -la $(GFX_BIN)/$(notdir $@);
dd if=$(GFX_BIN)/$(notdir $@) of=$(GFX_BIN)/$(notdir $@).out bs=1 skip=10;
cp $(GFX_BIN)/$(notdir $@).out $(GFX_BIN)/$(notdir $@);
gfx-test: gfx
test-gfx: gfx
unix2dos -n $(GFX_SRC)/autoexec.bat $(GFX_BIN)/autoexec.bat;
echo "omsxctl set renderer SDL\r" >> $(GFX_BIN)/autoexec.bat;
echo "omsxctl set throttle on\r" >> $(GFX_BIN)/autoexec.bat;
echo "omsxctl set speed 200\r" >> $(GFX_BIN)/autoexec.bat;
$(call run_openmsx_dos2, $(GFX_BIN))
$(call mb_run_openmsx_dos2, $(GFX_BIN))
gfx: $(GFX_BIN_FILES)
echo All GFX are compressed.

View file

@ -6,15 +6,16 @@ INIT_HEX := $(INIT_BIN)/$(INIT_NAME).hex
INIT_COM := $(INIT_BIN)/$(INIT_NAME).com
INIT_RELS := $(INIT_BIN)/$(INIT_NAME).rel
INIT_CODE := $(INIT_SRC)/$(INIT_NAME).asm
BUILD_HELP += \\n\\t* $(INIT_COM)
$(INIT_BIN):
$(call mod_mkdir,$(INIT_BIN))
$(call mb_mkdir,$(INIT_BIN))
$(INIT_BIN)/%.rel: $(INIT_SRC)/%.asm | $(INIT_BIN)
$(call mod_compile_asm,$@,$<)
$(call mb_compile_asm,$@,$<)
$(INIT_HEX): $(INIT_RELS)
$(call mod_link_asm_dos,$(INIT_HEX),$(INIT_RELS))
$(call mb_link_asm_dos,$(INIT_HEX),$(INIT_RELS))
$(INIT_COM): $(INIT_HEX)
$(call mod_hex2com,$(INIT_HEX),$(INIT_COM))
$(call mb_hex2com,$(INIT_HEX),$(INIT_COM))

View file

@ -2,31 +2,33 @@
LEVELS_NAME := levels
LEVELS_SRC := $(PATH_SRC)/$(LEVELS_NAME)
LEVELS_BIN := $(PATH_BIN)/$(LEVELS_NAME)
BUILD_HELP += \\n\\t* $(LEVELS_BIN)/code.001 / $(LEVELS_BIN)/code.002
$(LEVELS_BIN):
$(call mod_mkdir,$(LEVELS_BIN));
cp $(LEVELS_SRC)/*.00* $(LEVELS_BIN);
$(call mb_mkdir,$(LEVELS_BIN))
$(call mb_copy,$(LEVELS_SRC)/*.00*,$(LEVELS_BIN))
#cp $(LEVELS_SRC)/*.00* $(LEVELS_BIN);
$(LEVELS_BIN)/code001.rel: $(LEVELS_SRC)/code001.asm | $(LEVELS_BIN)
$(call mod_compile_asm,$@,$<)
$(call mb_compile_asm,$@,$<)
$(LEVELS_BIN)/code002.rel: $(LEVELS_SRC)/code001.asm | $(LEVELS_BIN)
$(call mod_compile_asm,$@,$<)
$(call mb_compile_asm,$@,$<)
$(LEVELS_BIN)/code001.hex: $(LEVELS_BIN)/code001.rel
$(call mod_link_asm_1000,$@,$<)
$(call mb_link_asm_1000,$@,$<)
$(LEVELS_BIN)/code002.hex: $(LEVELS_BIN)/code002.rel
$(call mod_link_asm_1000,$@,$<)
$(call mb_link_asm_1000,$@,$<)
$(LEVELS_BIN)/code001.dat: $(LEVELS_BIN)/code001.hex
$(call mod_hex2dat,$<,$@)
$(call mb_hex2dat,$<,$@)
$(LEVELS_BIN)/code002.dat: $(LEVELS_BIN)/code002.hex
$(call mod_hex2dat,$<,$@)
$(call mb_hex2dat,$<,$@)
$(LEVELS_BIN)/code.001: $(LEVELS_BIN)/code001.dat
cp $< $@
$(call mb_copy,$<,$@)
$(LEVELS_BIN)/code.002: $(LEVELS_BIN)/code002.dat
cp $< $@
$(call mb_copy,$<,$@)

View file

@ -6,15 +6,16 @@ LOADER_HEX := $(LOADER_BIN)/$(LOADER_NAME).hex
LOADER_DAT := $(LOADER_BIN)/$(LOADER_NAME).dat
LOADER_RELS := $(LOADER_BIN)/$(LOADER_NAME).rel
LOADER_CODE := $(LOADER_SRC)/$(LOADER_NAME).asm
BUILD_HELP += \\n\\t* $(LOADER_DAT)
$(LOADER_BIN):
$(call mod_mkdir,$(LOADER_BIN))
$(call mb_mkdir,$(LOADER_BIN))
$(LOADER_BIN)/%.rel: $(LOADER_SRC)/%.asm | $(LOADER_BIN)
$(call mod_compile_asm,$@,$<)
$(call mb_compile_asm,$@,$<)
$(LOADER_HEX): $(LOADER_RELS)
$(call mod_link_asm_8000,$(LOADER_HEX),$(LOADER_RELS))
$(call mb_link_asm_8000,$(LOADER_HEX),$(LOADER_RELS))
$(LOADER_DAT): $(LOADER_HEX)
$(call mod_hex2dat,$(LOADER_HEX),$(LOADER_DAT))
$(call mb_hex2dat,$(LOADER_HEX),$(LOADER_DAT))

View file

@ -6,15 +6,16 @@ MAKELIB_HEX := $(MAKELIB_BIN)/$(MAKELIB_NAME).hex
MAKELIB_COM := $(MAKELIB_BIN)/$(MAKELIB_NAME).com
MAKELIB_RELS := $(MAKELIB_BIN)/$(MAKELIB_NAME).rel
MAKELIB_CODE := $(MAKELIB_SRC)/$(MAKELIB_NAME).asm
BUILD_HELP += \\n\\t* $(MAKELIB_COM)
$(MAKELIB_BIN):
$(call mod_mkdir,$(MAKELIB_BIN))
$(call mb_mkdir,$(MAKELIB_BIN))
$(MAKELIB_BIN)/%.rel: $(MAKELIB_SRC)/%.asm | $(MAKELIB_BIN)
$(call mod_compile_asm,$@,$<)
$(call mb_compile_asm,$@,$<)
$(MAKELIB_HEX): $(MAKELIB_RELS)
$(call mod_link_asm_dos,$(MAKELIB_HEX),$(MAKELIB_RELS))
$(call mb_link_asm_dos,$(MAKELIB_HEX),$(MAKELIB_RELS))
$(MAKELIB_COM): $(MAKELIB_HEX)
$(call mod_hex2com,$(MAKELIB_HEX),$(MAKELIB_COM))
$(call mb_hex2com,$(MAKELIB_HEX),$(MAKELIB_COM))

View file

@ -6,15 +6,16 @@ MENU_HEX := $(MENU_BIN)/$(MENU_NAME).hex
MENU_DAT := $(MENU_BIN)/$(MENU_NAME).dat
MENU_RELS := $(MENU_BIN)/$(MENU_NAME).rel
MENU_CODE := $(MENU_SRC)/$(MENU_NAME).asm
BUILD_HELP += \\n\\t* $(MENU_DAT)
$(MENU_BIN):
$(call mod_mkdir,$(MENU_BIN))
$(call mb_mkdir,$(MENU_BIN))
$(MENU_BIN)/%.rel: $(MENU_SRC)/%.asm | $(MENU_BIN)
$(call mod_compile_asm,$@,$<)
$(call mb_compile_asm,$@,$<)
$(MENU_HEX): $(MENU_RELS)
$(call mod_link_asm_8000,$(MENU_HEX),$(MENU_RELS))
$(call mb_link_asm_8000,$(MENU_HEX),$(MENU_RELS))
$(MENU_DAT): $(MENU_HEX)
$(call mod_hex2dat,$(MENU_HEX),$(MENU_DAT))
$(call mb_hex2dat,$(MENU_HEX),$(MENU_DAT))

View file

@ -6,15 +6,16 @@ MMENU_HEX := $(MMENU_BIN)/$(MMENU_NAME).hex
MMENU_DAT := $(MMENU_BIN)/$(MMENU_NAME).dat
MMENU_RELS := $(MMENU_BIN)/$(MMENU_NAME).rel
MMENU_CODE := $(MMENU_SRC)/$(MMENU_NAME).asm
BUILD_HELP += \\n\\t* $(MMENU_DAT)
$(MMENU_BIN):
$(call mod_mkdir,$(MMENU_BIN))
$(call mb_mkdir,$(MMENU_BIN))
$(MMENU_BIN)/%.rel: $(MMENU_SRC)/%.asm | $(MMENU_BIN)
$(call mod_compile_asm,$@,$<)
$(call mb_compile_asm,$@,$<)
$(MMENU_HEX): $(MMENU_RELS)
$(call mod_link_asm_4000,$(MMENU_HEX),$(MMENU_RELS))
$(call mb_link_asm_4000,$(MMENU_HEX),$(MMENU_RELS))
$(MMENU_DAT): $(MMENU_HEX)
$(call mod_hex2dat,$(MMENU_HEX),$(MMENU_DAT))
$(call mb_hex2dat,$(MMENU_HEX),$(MMENU_DAT))