From f3f1ba740503f809c9e74dfeab775f0e8ed78e0d Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 30 Jun 2024 00:17:28 +0200 Subject: [PATCH] Updated msxbuild sdcc function order. --- src/bios/0module.mk | 6 +++--- src/dist-run/0module.mk | 2 +- src/dome/0module.mk | 6 +++--- src/init/0module.mk | 6 +++--- src/levels/0module.mk | 8 ++++---- src/loader/0module.mk | 6 +++--- src/makelib/0module.mk | 6 +++--- src/menu/0module.mk | 6 +++--- src/mmenu/0module.mk | 6 +++--- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/bios/0module.mk b/src/bios/0module.mk index a8fcc98..2c29424 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_sdcc_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$<,$@) $(BIOS_HEX): $(BIOS_RELS) - $(call mb_sdcc_link_asm_dos,$(BIOS_HEX),$(BIOS_RELS)) + $(call mb_sdcc_link_asm_dos,$<,$@) $(BIOS_DAT): $(BIOS_HEX) - $(call mb_sdcc_hex2bin,$(BIOS_HEX),$(BIOS_DAT)) + $(call mb_sdcc_hex2bin,$<,$@) diff --git a/src/dist-run/0module.mk b/src/dist-run/0module.mk index 73b4f12..56dcb8f 100644 --- a/src/dist-run/0module.mk +++ b/src/dist-run/0module.mk @@ -20,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_gui80_mouse,$(DIST_RUN_BIN),init) + $(call mb_autoexec_show_gui80_mouse,$(DIST_RUN_BIN),init) $(call mb_openmsx_dosctl,$(DIST_RUN_BIN)) diff --git a/src/dome/0module.mk b/src/dome/0module.mk index 02c6664..8fb0862 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_sdcc_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$<,$@) $(DOME_HEX): $(DOME_RELS) - $(call mb_sdcc_link_asm_8000,$(DOME_HEX),$(DOME_RELS)) + $(call mb_sdcc_link_asm_8000,$<,$@) $(DOME_DAT): $(DOME_HEX) - $(call mb_sdcc_hex2bin,$(DOME_HEX),$(DOME_DAT)) + $(call mb_sdcc_hex2bin,$<,$@) diff --git a/src/init/0module.mk b/src/init/0module.mk index 4de54db..6587c84 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_sdcc_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$<,$@) $(INIT_HEX): $(INIT_RELS) - $(call mb_sdcc_link_asm_dos,$(INIT_HEX),$(INIT_RELS)) + $(call mb_sdcc_link_asm_dos,$<,$@) $(INIT_COM): $(INIT_HEX) - $(call mb_sdcc_hex2bin,$(INIT_HEX),$(INIT_COM)) + $(call mb_sdcc_hex2bin,$<,$@) diff --git a/src/levels/0module.mk b/src/levels/0module.mk index 78072d3..518f412 100644 --- a/src/levels/0module.mk +++ b/src/levels/0module.mk @@ -10,16 +10,16 @@ $(LEVELS_BIN): #cp $(LEVELS_SRC)/*.00* $(LEVELS_BIN); $(LEVELS_BIN)/code001.rel: $(LEVELS_SRC)/code001.asm | $(LEVELS_BIN) - $(call mb_sdcc_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$<,$@) $(LEVELS_BIN)/code002.rel: $(LEVELS_SRC)/code001.asm | $(LEVELS_BIN) - $(call mb_sdcc_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$<,$@) $(LEVELS_BIN)/code001.hex: $(LEVELS_BIN)/code001.rel - $(call mb_sdcc_link_asm_1000,$@,$<) + $(call mb_sdcc_link_asm_1000,$<,$@) $(LEVELS_BIN)/code002.hex: $(LEVELS_BIN)/code002.rel - $(call mb_sdcc_link_asm_1000,$@,$<) + $(call mb_sdcc_link_asm_1000,$<,$@) $(LEVELS_BIN)/code001.dat: $(LEVELS_BIN)/code001.hex $(call mb_sdcc_hex2bin,$<,$@) diff --git a/src/loader/0module.mk b/src/loader/0module.mk index 027445b..220a597 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_sdcc_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$<,$@) $(LOADER_HEX): $(LOADER_RELS) - $(call mb_sdcc_link_asm_8000,$(LOADER_HEX),$(LOADER_RELS)) + $(call mb_sdcc_link_asm_8000,$<,$@) $(LOADER_DAT): $(LOADER_HEX) - $(call mb_sdcc_hex2bin,$(LOADER_HEX),$(LOADER_DAT)) + $(call mb_sdcc_hex2bin,$<,$@) diff --git a/src/makelib/0module.mk b/src/makelib/0module.mk index 130f3a6..476a714 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_sdcc_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$<,$@) $(MAKELIB_HEX): $(MAKELIB_RELS) - $(call mb_sdcc_link_asm_dos,$(MAKELIB_HEX),$(MAKELIB_RELS)) + $(call mb_sdcc_link_asm_dos,$<,$@) $(MAKELIB_COM): $(MAKELIB_HEX) - $(call mb_sdcc_hex2bin,$(MAKELIB_HEX),$(MAKELIB_COM)) + $(call mb_sdcc_hex2bin,$<,$@) diff --git a/src/menu/0module.mk b/src/menu/0module.mk index 2658978..363c97a 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_sdcc_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$<,$@) $(MENU_HEX): $(MENU_RELS) - $(call mb_sdcc_link_asm_8000,$(MENU_HEX),$(MENU_RELS)) + $(call mb_sdcc_link_asm_8000,$<,$@) $(MENU_DAT): $(MENU_HEX) - $(call mb_sdcc_hex2bin,$(MENU_HEX),$(MENU_DAT)) + $(call mb_sdcc_hex2bin,$<,$@) diff --git a/src/mmenu/0module.mk b/src/mmenu/0module.mk index 6364778..3a18a6e 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_sdcc_compile_asm,$@,$<) + $(call mb_sdcc_compile_asm,$<,$@) $(MMENU_HEX): $(MMENU_RELS) - $(call mb_sdcc_link_asm_4000,$(MMENU_HEX),$(MMENU_RELS)) + $(call mb_sdcc_link_asm_4000,$<,$@) $(MMENU_DAT): $(MMENU_HEX) - $(call mb_sdcc_hex2bin,$(MMENU_HEX),$(MMENU_DAT)) + $(call mb_sdcc_hex2bin,$<,$@)