From c250712cb0c3ef25d83dfc18993b308c53345b0b Mon Sep 17 00:00:00 2001
From: Willem <willemtsade.git.2022@distributedrebirth.love>
Date: Fri, 21 Jun 2024 21:47:55 +0200
Subject: [PATCH] Updated to lasted msxbuild

---
 src/dist-run/0module.mk |  4 +++-
 src/domelib/0module.mk  |  4 +++-
 src/gfx/0module.mk      | 12 ++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/dist-run/0module.mk b/src/dist-run/0module.mk
index d2cb257..88e7727 100644
--- a/src/dist-run/0module.mk
+++ b/src/dist-run/0module.mk
@@ -8,6 +8,8 @@ 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 $< $@;
@@ -21,4 +23,4 @@ $(DIST_RUN_BIN)/dome.000: bin/domelib/dome.000 | $(DIST_RUN_BIN)
 
 $(DIST_RUN_NAME): $(DIST_RUN_INC_BIN)
 	$(call mb_autoexec_open_gui_cmd,$(DIST_RUN_BIN),init)
-	$(call mb_openmsx_dos2,$(DIST_RUN_BIN))
+	$(call mb_openmsx_dosctl,$(DIST_RUN_BIN))
diff --git a/src/domelib/0module.mk b/src/domelib/0module.mk
index a3509e7..ac8bb39 100644
--- a/src/domelib/0module.mk
+++ b/src/domelib/0module.mk
@@ -14,6 +14,8 @@ $(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 $< $@;
@@ -41,4 +43,4 @@ $(DOMELIB_OUT): $(DOMELIB_BIN)/bios.dat $(DOMELIB_BIN)/dome.dat $(DOMELIB_BIN)/l
 	$(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))
-	$(call mb_openmsx_dos2, $(DOMELIB_BIN))
+	$(call mb_openmsx_dosctl,$(DOMELIB_BIN))
diff --git a/src/gfx/0module.mk b/src/gfx/0module.mk
index 87dc95e..7dbf750 100644
--- a/src/gfx/0module.mk
+++ b/src/gfx/0module.mk
@@ -20,11 +20,11 @@ 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_nextor,$(GFX_BIN))
 
-$(GFX_BIN)/popcom.com: $(GFX_BIN)
-	$(call mb_msxhub_file,$(GFX_BIN)/popcom.com,https://msxhub.com/api/POPCOM/1.00-1/get/POPCOM/popcom.com)
-	
-$(GFX_BIN)/%.zop: $(GFX_SRC)/%.ge5 | $(GFX_BIN) $(GFX_BIN)/popcom.com
+$(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)
@@ -44,13 +44,13 @@ $(GFX_BIN)/%.zop: $(GFX_SRC)/%.ge5 | $(GFX_BIN) $(GFX_BIN)/popcom.com
 	@echo "echo \"All done..................\"\r" >> $(GFX_BIN)/pop.bat;
 	@echo "omsxctl exit\r" >> $(GFX_BIN)/pop.bat;
 	
-	$(call mb_openmsx_dos2, $(GFX_BIN))
+	$(call mb_openmsx_dosctl,$(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_dos2,$(GFX_BIN))
+	$(call mb_openmsx_dosctl,$(GFX_BIN))
 
 gfx: $(GFX_BIN_FILES)
 	echo All GFX are compressed.