diff --git a/.gitignore b/.gitignore index fc850ff..5f5006f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,9 @@ old/** build/local.inc.mk .openmsx.cnt +# Makefile ignores +Makelocal.mk + # IDE ignores .project .vs/ diff --git a/Makefile b/Makefile index 3907cdb..1835e40 100644 --- a/Makefile +++ b/Makefile @@ -1,102 +1,32 @@ # -# Single top level makefile +# Top level makefile for dome # -rwildcard = $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) -MODULES := $(call rwildcard, src, */0module.mk) -MODULES_LIB := $(call rwildcard, src, */0module.lib.mk) - --include build/local.inc.mk -include build/env.inc.mk -include $(MODULES_LIB) -include $(MODULES) - +rwildcard = $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) +INC_MODS := $(call rwildcard, src, */0module.mk) +INC_LIBS := $(call rwildcard, src, */0module.lib.mk) +PATH_BIN := bin +PATH_SRC := src +BUILD_ALL := "Use 'make help' for possible targets." +BUILD_HELP := "Use one of the following build targets;" +MB_OPENMSX_JOYPORTA := mouse +.SUFFIXES: .PHONY: all all: - @echo TODO: All is build. + @echo $(BUILD_ALL) -.PHONY: test -test: - @echo TODO: Testing +BUILD_HELP += \\n\\t* help +.PHONY: help +help: + @echo $(BUILD_HELP) +BUILD_HELP += \\n\\t* clean .PHONY: clean clean: - @echo === Cleaning - $(RM) .openmsx.cnt; - @test $(PATH_BIN) && $(RM) -r $(PATH_BIN); + $(call mb_clean,$(PATH_BIN)) - -define mod_mkdir - @echo === Create module build folder. - $(MKDIR) $(1) -endef - -define mod_compile_asm - @echo === Compile module asm. - $(SDASM) $(SDASM_FLAGS) -I$(LIBASM_SRC)/include $(1) $(2) -endef - -define mod_link_asm_lib - @echo === Link module asm lib. - $(SDAR) $(SDAR_FLAGS) $(1) $(2) -endef - -define mod_link_asm_dos - @echo === Link module asm dos. - $(SDCC) $(SDCC_FLAG_CPU) --no-std-crt0 --code-loc 0x0100 -o $(1) $(2) -endef -define mod_link_asm_1000 - @echo === Link module asm 0x1000. - $(SDCC) $(SDCC_FLAG_CPU) --no-std-crt0 --code-loc 0x1000 -o $(1) $(2) -endef -define mod_link_asm_4000 - @echo === Link module asm 0x4000. - $(SDCC) $(SDCC_FLAG_CPU) --no-std-crt0 --code-loc 0x4000 -o $(1) $(2) -endef -define mod_link_asm_8000 - @echo === Link module asm 0x8000. - $(SDCC) $(SDCC_FLAG_CPU) --no-std-crt0 --code-loc 0x8000 -o $(1) $(2) -endef -#-l$(LIBASM_LINK) - -define mod_hex2com - @echo === Convert to binary - cd $(dir $(1)) && $(H2B) -e com $(notdir $(1)); - @sha1sum $(2); - @echo === Done $(notdir $(2)) -endef -define mod_hex2dat - @echo === Convert to binary - cd $(dir $(1)) && $(H2B) -e dat $(notdir $(1)); - @sha1sum $(2); - @echo === Done $(notdir $(2)) -endef - -#-diska $(1) -define run_openmsx - echo "." >> .openmsx.cnt; - FAIL_AFTER_BOOT=$(OPENMSX_BOOT_TIMEOUT) \ - FAIL_AFTER_PATH=bin \ - BOOT_HDD_PATH="$(1)" \ - BOOT_HDD_IMAGE="$(1)/../dsk.img" \ - RENDERER=None \ - THROTTLE=off \ - SPEED=333 \ - JOYPORTA=mouse \ - $(OPENMSX) -setting $(realpath build/openmsx-settings.xml) -machine $(OPENMSX_MACHINE) $(OPENMSX_ARGS) -endef -define run_openmsx_tools - cp build/tools/* $(1); - $(call run_openmsx, $(1)) -endef -define run_openmsx_dos1 - @echo === Run openmsx_dos1 - cp build/msxdos1/* $(1); - $(call run_openmsx_tools, $(1)) -endef -define run_openmsx_dos2 - @echo === Run openmsx_dos2 - cp build/msxdos2/* $(1); - $(call run_openmsx_tools, $(1)) -endef +-include Makelocal.mk +include $(PATH_MSXBUILD)/lib/make/msxbuild.mk +include $(INC_LIBS) +include $(INC_MODS) diff --git a/Makelocal.mk.tpl b/Makelocal.mk.tpl new file mode 100644 index 0000000..2917e3d --- /dev/null +++ b/Makelocal.mk.tpl @@ -0,0 +1,10 @@ +# Local included makefile fragment. +# Save this file without tpl suffix and custumize it. +# +# Change to local installations if needed; + +#PATH_SDCC ?= /usr/bin +#PATH_HEX2BIN ?= /usr/bin +#PATH_OPENMSX ?= /opt/openMSX/bin/ +#PATH_MSXBUILD ?= /opt/msxbuild + diff --git a/README.md b/README.md new file mode 100644 index 0000000..64d0a4e --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +### Dome + +Very raw port of orginal '99 code to sdcc format. + +The code is not fit for todays standards ;) + +## Running + +make dist-run + +note: requires working openmsx with 8250+ide roms. diff --git a/build/env.inc.mk b/build/env.inc.mk deleted file mode 100644 index f0b0205..0000000 --- a/build/env.inc.mk +++ /dev/null @@ -1,50 +0,0 @@ - -# Fill in all paths -PATH_SRC ?= src -PATH_BIN ?= bin -PATH_HEX2BIN ?= /usr/bin -PATH_SDCC ?= /usr/bin -PATH_OPENMSX ?= /usr/bin -PATH_CURRENT ?= $(dir $(lastword $(MAKEFILE_LIST))) - -# Build tools -H2B ?= $(PATH_HEX2BIN)/hex2bin -SDCC ?= $(PATH_SDCC)/sdcc -SDASM ?= $(PATH_SDCC)/sdasz80 -SDAR ?= $(PATH_SDCC)/sdar -OPENMSX ?= $(PATH_OPENMSX)/openmsx - -SDCC_FLAG_CPU ?= -mz80 -SDCC_FLAG_LD ?= --nostdinc -SDASM_FLAGS ?= -g -l -c -o -SDAR_FLAGS ?= -rc - -# - -OPENMSX_BOOT_TIMEOUT ?= 25 -OPENMSX_MACHINE ?= Philips_NMS_8250 -OPENMSX_ARGS ?= \ - -ext ram4mb \ - -ext ide \ - -script $(PATH_OPENMSX_SRC)/Contrib/msxbuild/boot_env.tcl \ - -script $(PATH_OPENMSX_SRC)/Contrib/msxbuild/boot_hdd.tcl \ - -script $(PATH_OPENMSX_SRC)/Contrib/msxbuild/fail_after.tcl \ - -script $(PATH_OPENMSX_SRC)/Contrib/omsxctl/omsxctl.tcl - -# OS cmds -ifeq ($(OS),Windows_NT) - RM = del /F /Q - RMDIR = -RMDIR /S /Q - MKDIR = -mkdir - ERRIGNORE = 2>NUL || true - SEP=\\ -else - RM = rm -rf - RMDIR = rm -rf - MKDIR = mkdir -p - ERRIGNORE = 2>/dev/null - SEP=/ -endif - -# Remove space after separator -PSEP = $(strip $(SEP)) diff --git a/build/local.inc.mk-template b/build/local.inc.mk-template deleted file mode 100644 index 4fc51bf..0000000 --- a/build/local.inc.mk-template +++ /dev/null @@ -1,13 +0,0 @@ -# Local env included makefile -# This file should be ignored in version control -# note: the ?= is so you can override those again in cmdline. -# -# Change to local installations. - -#PATH_SDCC ?= /usr/bin - -#PATH_HEX2BIN ?= /usr/bin - -#PATH_OPENMSX ?= /opt/openMSX/bin/ - -#PATH_OPENMSX_SRC ?= /usr/local/src/openMSX \ No newline at end of file diff --git a/build/openmsx-settings.xml b/build/openmsx-settings.xml deleted file mode 100644 index e2b859e..0000000 --- a/build/openmsx-settings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - false - 999 - none - 3 - - - diff --git a/build/tools/omsxctl.com b/build/tools/omsxctl.com deleted file mode 100644 index 2039f20..0000000 Binary files a/build/tools/omsxctl.com and /dev/null differ diff --git a/readme.md b/readme.md deleted file mode 100644 index ed0d922..0000000 --- a/readme.md +++ /dev/null @@ -1,2 +0,0 @@ -# udome - diff --git a/src/bios/0module.mk b/src/bios/0module.mk index 91b4c11..59bf032 100644 --- a/src/bios/0module.mk +++ b/src/bios/0module.mk @@ -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)) diff --git a/src/dist-run/0module.mk b/src/dist-run/0module.mk index 5478631..003689c 100644 --- a/src/dist-run/0module.mk +++ b/src/dist-run/0module.mk @@ -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)) diff --git a/src/dist-run/autoexec.bat b/src/dist-run/autoexec.bat index d73ccd9..4350bdb 100644 --- a/src/dist-run/autoexec.bat +++ b/src/dist-run/autoexec.bat @@ -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 diff --git a/src/dist/WAVEDRV.COM b/src/dist/WAVEDRV.COM new file mode 100755 index 0000000..0766c8e Binary files /dev/null and b/src/dist/WAVEDRV.COM differ diff --git a/src/dist/WAVER800.DRV b/src/dist/WAVER800.DRV new file mode 100755 index 0000000..30b7f60 Binary files /dev/null and b/src/dist/WAVER800.DRV differ diff --git a/src/dist/WAVEZ80X.DRV b/src/dist/WAVEZ80X.DRV new file mode 100755 index 0000000..2262099 Binary files /dev/null and b/src/dist/WAVEZ80X.DRV differ diff --git a/src/dist/menu.zop b/src/dist/menu.zop new file mode 100755 index 0000000..4a1ab48 Binary files /dev/null and b/src/dist/menu.zop differ diff --git a/src/dist/unittot.zop b/src/dist/unittot.zop new file mode 100755 index 0000000..2ddd901 Binary files /dev/null and b/src/dist/unittot.zop differ diff --git a/src/dome/0module.mk b/src/dome/0module.mk index 8eaa05d..116e137 100644 --- a/src/dome/0module.mk +++ b/src/dome/0module.mk @@ -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)) diff --git a/src/domelib/0module.mk b/src/domelib/0module.mk index 77f4ed2..2348e0a 100644 --- a/src/domelib/0module.mk +++ b/src/domelib/0module.mk @@ -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)) diff --git a/src/gfx/0module.mk b/src/gfx/0module.mk index 6362ffe..a5bed7e 100644 --- a/src/gfx/0module.mk +++ b/src/gfx/0module.mk @@ -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. diff --git a/src/init/0module.mk b/src/init/0module.mk index 55499e4..ce2261f 100644 --- a/src/init/0module.mk +++ b/src/init/0module.mk @@ -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)) diff --git a/src/levels/0module.mk b/src/levels/0module.mk index 312724b..65a5e4a 100644 --- a/src/levels/0module.mk +++ b/src/levels/0module.mk @@ -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 $< $@ \ No newline at end of file + $(call mb_copy,$<,$@) diff --git a/src/loader/0module.mk b/src/loader/0module.mk index 8bc27b6..1ec93c4 100644 --- a/src/loader/0module.mk +++ b/src/loader/0module.mk @@ -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)) diff --git a/src/makelib/0module.mk b/src/makelib/0module.mk index 98e6dd6..1ca32fc 100644 --- a/src/makelib/0module.mk +++ b/src/makelib/0module.mk @@ -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)) diff --git a/src/menu/0module.mk b/src/menu/0module.mk index 62ee7f5..56d4c92 100644 --- a/src/menu/0module.mk +++ b/src/menu/0module.mk @@ -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)) diff --git a/src/mmenu/0module.mk b/src/mmenu/0module.mk index e7d4146..24448c6 100644 --- a/src/mmenu/0module.mk +++ b/src/mmenu/0module.mk @@ -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))