From 5bd5564cece2a971a1a4ebefee6e5b0eda2411c4 Mon Sep 17 00:00:00 2001 From: Willem Date: Sat, 7 Sep 2024 15:36:12 +0200 Subject: [PATCH] Migrated to lastest msxbuild. --- Makefile | 7 +++---- src/dist-run/0module.mk | 6 +++--- src/dist/0module.mk | 16 ++++++++-------- src/tara/0module.mk | 8 ++++---- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 1694a02..b9790c2 100644 --- a/Makefile +++ b/Makefile @@ -20,11 +20,10 @@ help: BUILD_HELP += \\n\\t* clean .PHONY: clean clean: - $(call mb_make_call,mb_os_dir_delete,$(PATH_BIN)) + $(call mb-make-call,mb-os-dir-delete,$(PATH_BIN)) -include Makelocal.mk -include $(PATH_MSXBUILD)/lib/make/msxbuild-prolog.mk +include $(PATH_MSXBUILD)/msxbuild.mk .RECIPEPREFIX := -include $(PATH_MSXBUILD)/lib/make/msxbuild.mk -$(call mb_make_call,mb_make_flow_0module,$(PATH_SRC)) +$(call mb-make-call,mb-flow-nx01-skywalker,$(PATH_SRC)) diff --git a/src/dist-run/0module.mk b/src/dist-run/0module.mk index ce3d2cf..1941047 100644 --- a/src/dist-run/0module.mk +++ b/src/dist-run/0module.mk @@ -7,10 +7,10 @@ DIST_RUN_DEP := $(DIST_RUN_BIN)/tara.com BUILD_HELP += \\n\\t* $(DIST_RUN_NAME) $(DIST_RUN_BIN): - $(call mb_make_call,mb_os_dir_create,$(DIST_RUN_BIN)) + $(call mb-make-call,mb-os-dir-create,$(DIST_RUN_BIN)) $(DIST_RUN_DEP): $(DIST_RUN_DEP_TAR) | $(DIST_RUN_BIN) - $(call mb_make_call,mb_os_file_copy,$(PATH_BIN)/dist/*,$(DIST_RUN_BIN)) + $(call mb-make-call,mb-os-file-copy,$(PATH_BIN)/dist/*,$(DIST_RUN_BIN)) $(DIST_RUN_NAME): $(DIST_RUN_DEP) - $(call mb_make_call,mb_msxpipe_run_gui_mouse,$(DIST_RUN_BIN),tara) + $(call mb-make-call,mb-msxpipe-run-gui-mouse,$(DIST_RUN_BIN),tara) diff --git a/src/dist/0module.mk b/src/dist/0module.mk index 1c727e9..677e966 100644 --- a/src/dist/0module.mk +++ b/src/dist/0module.mk @@ -11,18 +11,18 @@ DIST_TARA_SRC := $(PATH_BIN)/tara/tara.com BUILD_HELP += \\n\\t* $(DIST_OUT) $(DIST_BIN): - $(call mb_make_call,mb_os_dir_create,$(DIST_BIN)) + $(call mb-make-call,mb-os-dir-create,$(DIST_BIN)) $(DIST_BIN)/all.sr8: $(DIST_SRC)/all.sr8 | $(DIST_BIN) - $(call mb_make_call,mb_os_file_copy,$<,$@) + $(call mb-make-call,mb-os-file-copy,$<,$@) $(DIST_BIN)/ascii.sr8: $(DIST_SRC)/ascii.sr8 | $(DIST_BIN) - $(call mb_make_call,mb_os_file_copy,$<,$@) + $(call mb-make-call,mb-os-file-copy,$<,$@) $(DIST_BIN)/veld.sr8: $(DIST_SRC)/veld.sr8 | $(DIST_BIN) - $(call mb_make_call,mb_os_file_copy,$<,$@) + $(call mb-make-call,mb-os-file-copy,$<,$@) $(DIST_BIN)/veldback.4bp: $(DIST_SRC)/veldback.4bp | $(DIST_BIN) - $(call mb_make_call,mb_os_file_copy,$<,$@) + $(call mb-make-call,mb-os-file-copy,$<,$@) $(DIST_BIN)/readme.txt: $(DIST_SRC)/readme.txt | $(DIST_BIN) - $(call mb_make_call,mb_os_file_copy,$<,$@) + $(call mb-make-call,mb-os-file-copy,$<,$@) $(DIST_TARA_BIN): $(DIST_TARA_SRC) | $(DIST_BIN) - $(call mb_make_call,mb_os_file_copy,$<,$@) + $(call mb-make-call,mb-os-file-copy,$<,$@) $(DIST_OUT): | $(DIST_INC_BIN) $(DIST_TARA_BIN) - $(call mb_make_call,mb_package_create_archive,$(DIST_BIN),$@) + $(call mb-make-call,mb-package-create-archive,$(DIST_BIN),$@) diff --git a/src/tara/0module.mk b/src/tara/0module.mk index 18f51f9..f9cb9f9 100644 --- a/src/tara/0module.mk +++ b/src/tara/0module.mk @@ -9,13 +9,13 @@ TARA_CODE := $(TARA_SRC)/$(TARA_NAME).asm BUILD_HELP += \\n\\t* $(TARA_COM) $(TARA_BIN): - $(call mb_make_call,mb_os_dir_create,$(TARA_BIN)) + $(call mb-make-call,mb-os-dir-create,$(TARA_BIN)) $(TARA_BIN)/%.rel: $(TARA_SRC)/%.asm | $(TARA_BIN) - $(call mb_make_call,mb_sdcc_compile_asm,$<,$@) + $(call mb-make-call,mb-sdcc-compile-asm,$<,$@) $(TARA_HEX): $(TARA_RELS) - $(call mb_make_call,mb_sdcc_link_asm_bdos,$<,$@) + $(call mb-make-call,mb-sdcc-link-asm-bdos,$<,$@) $(TARA_COM): $(TARA_HEX) - $(call mb_make_call,mb_sdcc_objcopy,$<,$@) + $(call mb-make-call,mb-sdcc-objcopy,$<,$@)