From 7548d1d2dc0784d977fbb52d5e6f71f7cffb925a Mon Sep 17 00:00:00 2001 From: Willem Date: Fri, 2 Jul 2021 17:37:18 +0200 Subject: [PATCH] Small workaround for gfx and updated to released msxbuild. --- src/dist-run/0module.mk | 3 ++- src/domelib/0module.mk | 2 +- src/gfx/0module.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/dist-run/0module.mk b/src/dist-run/0module.mk index 003689c..cbc3a76 100644 --- a/src/dist-run/0module.mk +++ b/src/dist-run/0module.mk @@ -19,7 +19,8 @@ $(DIST_RUN_BIN)/dome.000: bin/domelib/dome.000 | $(DIST_RUN_BIN) cp bin/domelib/*.zop $(DIST_RUN_BIN); cp bin/domelib/*.dat $(DIST_RUN_BIN); cp bin/domelib/*.00* $(DIST_RUN_BIN); - + echo "=== Overwrite org zop gfx until working..." + cp src/gfx/old/*.zop $(DIST_RUN_BIN); $(DIST_RUN_NAME): $(DIST_RUN_INC_BIN) $(call mb_openmsx_dos2,$(DIST_RUN_BIN)) diff --git a/src/domelib/0module.mk b/src/domelib/0module.mk index 2348e0a..f7f8222 100644 --- a/src/domelib/0module.mk +++ b/src/domelib/0module.mk @@ -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 mb_run_openmsx_dos2, $(DOMELIB_BIN)) + $(call mb_openmsx_dos2, $(DOMELIB_BIN)) diff --git a/src/gfx/0module.mk b/src/gfx/0module.mk index a5bed7e..b905b38 100644 --- a/src/gfx/0module.mk +++ b/src/gfx/0module.mk @@ -35,7 +35,7 @@ $(GFX_BIN)/%.zop: $(GFX_SRC)/%.ge5 | $(GFX_BIN) @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)) + $(call mb_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 $@); @@ -45,7 +45,7 @@ test-gfx: gfx 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 mb_run_openmsx_dos2, $(GFX_BIN)) + $(call mb_openmsx_dos2, $(GFX_BIN)) gfx: $(GFX_BIN_FILES) echo All GFX are compressed.