From 09666a622e8c419a68db8249f77eb9169c6f737d Mon Sep 17 00:00:00 2001 From: Willem Date: Sat, 29 Jun 2024 03:29:29 +0200 Subject: [PATCH] Updated to lastest msxbuild version. --- src/bios/0module.mk | 6 +++--- src/dist-run/0module.mk | 4 +--- src/dome/0module.mk | 6 +++--- src/domelib/0module.mk | 4 +--- src/gfx/0module.mk | 4 +--- src/init/0module.mk | 6 +++--- src/levels/0module.mk | 12 ++++++------ src/loader/0module.mk | 6 +++--- src/makelib/0module.mk | 6 +++--- src/menu/0module.mk | 6 +++--- src/mmenu/0module.mk | 6 +++--- 11 files changed, 30 insertions(+), 36 deletions(-) diff --git a/src/bios/0module.mk b/src/bios/0module.mk index 8c91d43..a8fcc98 100644 --- a/src/bios/0module.mk +++ b/src/bios/0module.mk @@ -12,10 +12,10 @@ $(BIOS_BIN): $(call mb_mkdir,$(BIOS_BIN)) $(BIOS_BIN)/%.rel: $(BIOS_SRC)/%.asm | $(BIOS_BIN) - $(call mb_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$@,$<) $(BIOS_HEX): $(BIOS_RELS) - $(call mb_link_asm_dos,$(BIOS_HEX),$(BIOS_RELS)) + $(call mb_sdcc_link_asm_dos,$(BIOS_HEX),$(BIOS_RELS)) $(BIOS_DAT): $(BIOS_HEX) - $(call mb_hex2bin,$(BIOS_HEX),$(BIOS_DAT)) + $(call mb_sdcc_hex2bin,$(BIOS_HEX),$(BIOS_DAT)) diff --git a/src/dist-run/0module.mk b/src/dist-run/0module.mk index 88e7727..f27374d 100644 --- a/src/dist-run/0module.mk +++ b/src/dist-run/0module.mk @@ -8,8 +8,6 @@ BUILD_HELP += \\n\\t* $(DIST_RUN_NAME) $(DIST_RUN_BIN): $(call mb_mkdir,$(DIST_RUN_BIN)) - $(call mb_package_emuctl,$(DIST_RUN_BIN)) - $(call mb_package_nextor,$(DIST_RUN_BIN)) $(DIST_RUN_BIN)/init.com: bin/init/init.com | $(DIST_RUN_BIN) cp $< $@; @@ -22,5 +20,5 @@ $(DIST_RUN_BIN)/dome.000: bin/domelib/dome.000 | $(DIST_RUN_BIN) cp src/gfx/org/*.zop $(DIST_RUN_BIN); $(DIST_RUN_NAME): $(DIST_RUN_INC_BIN) - $(call mb_autoexec_open_gui_cmd,$(DIST_RUN_BIN),init) + $(call mb_autoexec_open_gui80,$(DIST_RUN_BIN),init) $(call mb_openmsx_dosctl,$(DIST_RUN_BIN)) diff --git a/src/dome/0module.mk b/src/dome/0module.mk index 4151d79..02c6664 100644 --- a/src/dome/0module.mk +++ b/src/dome/0module.mk @@ -14,10 +14,10 @@ $(DOME_BIN): $(call mb_mkdir,$(DOME_BIN)) $(DOME_BIN)/%.rel: $(DOME_SRC)/%.asm | $(DOME_BIN) - $(call mb_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$@,$<) $(DOME_HEX): $(DOME_RELS) - $(call mb_link_asm_8000,$(DOME_HEX),$(DOME_RELS)) + $(call mb_sdcc_link_asm_8000,$(DOME_HEX),$(DOME_RELS)) $(DOME_DAT): $(DOME_HEX) - $(call mb_hex2bin,$(DOME_HEX),$(DOME_DAT)) + $(call mb_sdcc_hex2bin,$(DOME_HEX),$(DOME_DAT)) diff --git a/src/domelib/0module.mk b/src/domelib/0module.mk index ac8bb39..bd26c4e 100644 --- a/src/domelib/0module.mk +++ b/src/domelib/0module.mk @@ -14,8 +14,6 @@ $(PATH_BIN)/mmenu/mmenu.dat $(DOMELIB_BIN): $(call mb_mkdir,$(DOMELIB_BIN)) - $(call mb_package_emuctl,$(DOMELIB_BIN)) - $(call mb_package_nextor,$(DOMELIB_BIN)) $(DOMELIB_BIN)/bios.dat: $(PATH_BIN)/bios/bios.dat | $(DOMELIB_BIN) cp $< $@; @@ -39,7 +37,7 @@ $(DOMELIB_OUT): $(DOMELIB_BIN)/bios.dat $(DOMELIB_BIN)/dome.dat $(DOMELIB_BIN)/l @echo === Generating autoexec.bat for command $(call mb_autoexec_write_default,$(DOMELIB_BIN)) $(call mb_autoexec_append_echo,$(DOMELIB_BIN),Setup timeout for makelib) - $(call mb_autoexec_append_cmd,$(DOMELIB_BIN),omsxctl fail_after 120 seconds fail_makelib 126) + $(call mb_autoexec_append_cmd,$(DOMELIB_BIN),omsxctl fail_after 120 seconds failed_makelib 126) $(call mb_autoexec_append_echo,$(DOMELIB_BIN),Running command makelib) $(call mb_autoexec_append_cmd,$(DOMELIB_BIN),makelib) $(call mb_autoexec_append_exit,$(DOMELIB_BIN)) diff --git a/src/gfx/0module.mk b/src/gfx/0module.mk index d536828..42e4ac8 100644 --- a/src/gfx/0module.mk +++ b/src/gfx/0module.mk @@ -20,9 +20,7 @@ BUILD_HELP += \\n\\t* gfx / test-gfx $(GFX_BIN): $(call mb_mkdir,$(GFX_BIN)) - $(call mb_package_emuctl,$(GFX_BIN)) - $(call mb_package_popcom,$(GFX_BIN)) - $(call mb_package_nextor,$(GFX_BIN)) + $(call mb_msxhub_get_popcom,$(GFX_BIN)) $(GFX_BIN)/%.zop: $(GFX_SRC)/%.ge5 | $(GFX_BIN) cp $< $(GFX_BIN) diff --git a/src/init/0module.mk b/src/init/0module.mk index c63263c..4de54db 100644 --- a/src/init/0module.mk +++ b/src/init/0module.mk @@ -12,10 +12,10 @@ $(INIT_BIN): $(call mb_mkdir,$(INIT_BIN)) $(INIT_BIN)/%.rel: $(INIT_SRC)/%.asm | $(INIT_BIN) - $(call mb_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$@,$<) $(INIT_HEX): $(INIT_RELS) - $(call mb_link_asm_dos,$(INIT_HEX),$(INIT_RELS)) + $(call mb_sdcc_link_asm_dos,$(INIT_HEX),$(INIT_RELS)) $(INIT_COM): $(INIT_HEX) - $(call mb_hex2bin,$(INIT_HEX),$(INIT_COM)) + $(call mb_sdcc_hex2bin,$(INIT_HEX),$(INIT_COM)) diff --git a/src/levels/0module.mk b/src/levels/0module.mk index b94a351..78072d3 100644 --- a/src/levels/0module.mk +++ b/src/levels/0module.mk @@ -10,22 +10,22 @@ $(LEVELS_BIN): #cp $(LEVELS_SRC)/*.00* $(LEVELS_BIN); $(LEVELS_BIN)/code001.rel: $(LEVELS_SRC)/code001.asm | $(LEVELS_BIN) - $(call mb_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$@,$<) $(LEVELS_BIN)/code002.rel: $(LEVELS_SRC)/code001.asm | $(LEVELS_BIN) - $(call mb_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$@,$<) $(LEVELS_BIN)/code001.hex: $(LEVELS_BIN)/code001.rel - $(call mb_link_asm_1000,$@,$<) + $(call mb_sdcc_link_asm_1000,$@,$<) $(LEVELS_BIN)/code002.hex: $(LEVELS_BIN)/code002.rel - $(call mb_link_asm_1000,$@,$<) + $(call mb_sdcc_link_asm_1000,$@,$<) $(LEVELS_BIN)/code001.dat: $(LEVELS_BIN)/code001.hex - $(call mb_hex2bin,$<,$@) + $(call mb_sdcc_hex2bin,$<,$@) $(LEVELS_BIN)/code002.dat: $(LEVELS_BIN)/code002.hex - $(call mb_hex2bin,$<,$@) + $(call mb_sdcc_hex2bin,$<,$@) $(LEVELS_BIN)/code.001: $(LEVELS_BIN)/code001.dat $(call mb_copy,$<,$@) diff --git a/src/loader/0module.mk b/src/loader/0module.mk index e775883..027445b 100644 --- a/src/loader/0module.mk +++ b/src/loader/0module.mk @@ -12,10 +12,10 @@ $(LOADER_BIN): $(call mb_mkdir,$(LOADER_BIN)) $(LOADER_BIN)/%.rel: $(LOADER_SRC)/%.asm | $(LOADER_BIN) - $(call mb_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$@,$<) $(LOADER_HEX): $(LOADER_RELS) - $(call mb_link_asm_8000,$(LOADER_HEX),$(LOADER_RELS)) + $(call mb_sdcc_link_asm_8000,$(LOADER_HEX),$(LOADER_RELS)) $(LOADER_DAT): $(LOADER_HEX) - $(call mb_hex2bin,$(LOADER_HEX),$(LOADER_DAT)) + $(call mb_sdcc_hex2bin,$(LOADER_HEX),$(LOADER_DAT)) diff --git a/src/makelib/0module.mk b/src/makelib/0module.mk index 9e43b3d..130f3a6 100644 --- a/src/makelib/0module.mk +++ b/src/makelib/0module.mk @@ -12,10 +12,10 @@ $(MAKELIB_BIN): $(call mb_mkdir,$(MAKELIB_BIN)) $(MAKELIB_BIN)/%.rel: $(MAKELIB_SRC)/%.asm | $(MAKELIB_BIN) - $(call mb_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$@,$<) $(MAKELIB_HEX): $(MAKELIB_RELS) - $(call mb_link_asm_dos,$(MAKELIB_HEX),$(MAKELIB_RELS)) + $(call mb_sdcc_link_asm_dos,$(MAKELIB_HEX),$(MAKELIB_RELS)) $(MAKELIB_COM): $(MAKELIB_HEX) - $(call mb_hex2bin,$(MAKELIB_HEX),$(MAKELIB_COM)) + $(call mb_sdcc_hex2bin,$(MAKELIB_HEX),$(MAKELIB_COM)) diff --git a/src/menu/0module.mk b/src/menu/0module.mk index e108c3d..2658978 100644 --- a/src/menu/0module.mk +++ b/src/menu/0module.mk @@ -12,10 +12,10 @@ $(MENU_BIN): $(call mb_mkdir,$(MENU_BIN)) $(MENU_BIN)/%.rel: $(MENU_SRC)/%.asm | $(MENU_BIN) - $(call mb_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$@,$<) $(MENU_HEX): $(MENU_RELS) - $(call mb_link_asm_8000,$(MENU_HEX),$(MENU_RELS)) + $(call mb_sdcc_link_asm_8000,$(MENU_HEX),$(MENU_RELS)) $(MENU_DAT): $(MENU_HEX) - $(call mb_hex2bin,$(MENU_HEX),$(MENU_DAT)) + $(call mb_sdcc_hex2bin,$(MENU_HEX),$(MENU_DAT)) diff --git a/src/mmenu/0module.mk b/src/mmenu/0module.mk index 8359cef..6364778 100644 --- a/src/mmenu/0module.mk +++ b/src/mmenu/0module.mk @@ -12,10 +12,10 @@ $(MMENU_BIN): $(call mb_mkdir,$(MMENU_BIN)) $(MMENU_BIN)/%.rel: $(MMENU_SRC)/%.asm | $(MMENU_BIN) - $(call mb_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$@,$<) $(MMENU_HEX): $(MMENU_RELS) - $(call mb_link_asm_4000,$(MMENU_HEX),$(MMENU_RELS)) + $(call mb_sdcc_link_asm_4000,$(MMENU_HEX),$(MMENU_RELS)) $(MMENU_DAT): $(MMENU_HEX) - $(call mb_hex2bin,$(MMENU_HEX),$(MMENU_DAT)) + $(call mb_sdcc_hex2bin,$(MMENU_HEX),$(MMENU_DAT))