From 256a50ce801a65f0daef150fc1ecd180f937b266 Mon Sep 17 00:00:00 2001
From: Willem <willemtsade.git.2022@distributedrebirth.love>
Date: Mon, 24 Jun 2024 13:46:17 +0200
Subject: [PATCH] Updated to lasted msxbuild version.

---
 Makelocal.mk.tpl       | 1 -
 src/bios/0module.mk    | 2 +-
 src/dome/0module.mk    | 2 +-
 src/gfx/0module.mk     | 5 +----
 src/init/0module.mk    | 2 +-
 src/levels/0module.mk  | 4 ++--
 src/loader/0module.mk  | 2 +-
 src/makelib/0module.mk | 2 +-
 src/menu/0module.mk    | 2 +-
 src/mmenu/0module.mk   | 2 +-
 10 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/Makelocal.mk.tpl b/Makelocal.mk.tpl
index 2917e3d..d9e3d80 100644
--- a/Makelocal.mk.tpl
+++ b/Makelocal.mk.tpl
@@ -4,7 +4,6 @@
 # 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/src/bios/0module.mk b/src/bios/0module.mk
index 2689c07..8c91d43 100644
--- a/src/bios/0module.mk
+++ b/src/bios/0module.mk
@@ -18,4 +18,4 @@ $(BIOS_HEX): $(BIOS_RELS)
 	$(call mb_link_asm_dos,$(BIOS_HEX),$(BIOS_RELS))
 
 $(BIOS_DAT): $(BIOS_HEX)
-	$(call mb_hex2dat,$(BIOS_HEX),$(BIOS_DAT))
+	$(call mb_hex2bin,$(BIOS_HEX),$(BIOS_DAT))
diff --git a/src/dome/0module.mk b/src/dome/0module.mk
index f7b1818..4151d79 100644
--- a/src/dome/0module.mk
+++ b/src/dome/0module.mk
@@ -20,4 +20,4 @@ $(DOME_HEX): $(DOME_RELS)
 	$(call mb_link_asm_8000,$(DOME_HEX),$(DOME_RELS))
 
 $(DOME_DAT): $(DOME_HEX)
-	$(call mb_hex2dat,$(DOME_HEX),$(DOME_DAT))
+	$(call mb_hex2bin,$(DOME_HEX),$(DOME_DAT))
diff --git a/src/gfx/0module.mk b/src/gfx/0module.mk
index 7dbf750..d536828 100644
--- a/src/gfx/0module.mk
+++ b/src/gfx/0module.mk
@@ -20,15 +20,14 @@ BUILD_HELP		+= \\n\\t* gfx / test-gfx
 
 $(GFX_BIN):
 	$(call mb_mkdir,$(GFX_BIN))
-	$(call mb_package_popcom,$(GFX_BIN))
 	$(call mb_package_emuctl,$(GFX_BIN))
+	$(call mb_package_popcom,$(GFX_BIN))
 	$(call mb_package_nextor,$(GFX_BIN))
 
 $(GFX_BIN)/%.zop: $(GFX_SRC)/%.ge5 | $(GFX_BIN)
 	cp $< $(GFX_BIN)
 	$(call mb_autoexec_write_default,$(GFX_BIN))
 	$(call mb_autoexec_append_cmd,$(GFX_BIN),omsxctl fail_after 60 seconds fail_basic_script 126 > NUL)
-	#add-gui-debug; $(call mb_autoexec_append_cmd,$(GFX_BIN),omsxctl set renderer SDL > NUL)
 	$(call mb_autoexec_append_echo,$(GFX_BIN),Running basic conversion step)
 	$(call mb_autoexec_append_cmd,$(GFX_BIN),basic conv.bas)
 	
@@ -48,8 +47,6 @@ $(GFX_BIN)/%.zop: $(GFX_SRC)/%.ge5 | $(GFX_BIN)
 
 test-gfx: gfx
 	$(call mb_autoexec_open_gui,$(GFX_BIN))
-	$(call mb_autoexec_append_echo,$(GFX_BIN),Selecting 7Mhz speed.)
-	$(call mb_autoexec_append_cmd,$(GFX_BIN),omsxctl set speed 200 > NUL)
 	$(call mb_openmsx_dosctl,$(GFX_BIN))
 
 gfx: $(GFX_BIN_FILES)
diff --git a/src/init/0module.mk b/src/init/0module.mk
index f60ad70..c63263c 100644
--- a/src/init/0module.mk
+++ b/src/init/0module.mk
@@ -18,4 +18,4 @@ $(INIT_HEX): $(INIT_RELS)
 	$(call mb_link_asm_dos,$(INIT_HEX),$(INIT_RELS))
 
 $(INIT_COM): $(INIT_HEX)
-	$(call mb_hex2com,$(INIT_HEX),$(INIT_COM))
+	$(call mb_hex2bin,$(INIT_HEX),$(INIT_COM))
diff --git a/src/levels/0module.mk b/src/levels/0module.mk
index cf05893..b94a351 100644
--- a/src/levels/0module.mk
+++ b/src/levels/0module.mk
@@ -22,10 +22,10 @@ $(LEVELS_BIN)/code002.hex: $(LEVELS_BIN)/code002.rel
 	$(call mb_link_asm_1000,$@,$<)
 	
 $(LEVELS_BIN)/code001.dat: $(LEVELS_BIN)/code001.hex
-	$(call mb_hex2dat,$<,$@)
+	$(call mb_hex2bin,$<,$@)
 	
 $(LEVELS_BIN)/code002.dat: $(LEVELS_BIN)/code002.hex
-	$(call mb_hex2dat,$<,$@)
+	$(call mb_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 c6cb185..e775883 100644
--- a/src/loader/0module.mk
+++ b/src/loader/0module.mk
@@ -18,4 +18,4 @@ $(LOADER_HEX): $(LOADER_RELS)
 	$(call mb_link_asm_8000,$(LOADER_HEX),$(LOADER_RELS))
 
 $(LOADER_DAT): $(LOADER_HEX)
-	$(call mb_hex2dat,$(LOADER_HEX),$(LOADER_DAT))
+	$(call mb_hex2bin,$(LOADER_HEX),$(LOADER_DAT))
diff --git a/src/makelib/0module.mk b/src/makelib/0module.mk
index 64dddfc..9e43b3d 100644
--- a/src/makelib/0module.mk
+++ b/src/makelib/0module.mk
@@ -18,4 +18,4 @@ $(MAKELIB_HEX): $(MAKELIB_RELS)
 	$(call mb_link_asm_dos,$(MAKELIB_HEX),$(MAKELIB_RELS))
 
 $(MAKELIB_COM): $(MAKELIB_HEX)
-	$(call mb_hex2com,$(MAKELIB_HEX),$(MAKELIB_COM))
+	$(call mb_hex2bin,$(MAKELIB_HEX),$(MAKELIB_COM))
diff --git a/src/menu/0module.mk b/src/menu/0module.mk
index a070e45..e108c3d 100644
--- a/src/menu/0module.mk
+++ b/src/menu/0module.mk
@@ -18,4 +18,4 @@ $(MENU_HEX): $(MENU_RELS)
 	$(call mb_link_asm_8000,$(MENU_HEX),$(MENU_RELS))
 
 $(MENU_DAT): $(MENU_HEX)
-	$(call mb_hex2dat,$(MENU_HEX),$(MENU_DAT))
+	$(call mb_hex2bin,$(MENU_HEX),$(MENU_DAT))
diff --git a/src/mmenu/0module.mk b/src/mmenu/0module.mk
index 8cd36e1..8359cef 100644
--- a/src/mmenu/0module.mk
+++ b/src/mmenu/0module.mk
@@ -18,4 +18,4 @@ $(MMENU_HEX): $(MMENU_RELS)
 	$(call mb_link_asm_4000,$(MMENU_HEX),$(MMENU_RELS))
 
 $(MMENU_DAT): $(MMENU_HEX)
-	$(call mb_hex2dat,$(MMENU_HEX),$(MMENU_DAT))
+	$(call mb_hex2bin,$(MMENU_HEX),$(MMENU_DAT))