From 5ce923b3fba5055251b6f70b4b35bec0eb36158d Mon Sep 17 00:00:00 2001
From: Willem <willemtsade.git.2022@distributedrebirth.love>
Date: Tue, 25 Jun 2024 15:46:31 +0200
Subject: [PATCH] Used MB_CACHE to store omsxctl

---
 lib/make/mb_base.mk     |  4 ++--
 lib/make/mb_msxhub.mk   |  1 -
 lib/make/mb_openmsx.mk  | 14 +++++++-------
 lib/make/mb_packages.mk |  4 ++--
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/make/mb_base.mk b/lib/make/mb_base.mk
index 17a3a90..651c953 100644
--- a/lib/make/mb_base.mk
+++ b/lib/make/mb_base.mk
@@ -7,7 +7,7 @@ ifeq ($(OS),Windows_NT)
 	MB_COPY = copy
 	MB_ERRIGNORE = 2>NUL || true
 	MB_SEP=\\
-	MB_CACHE=%LOCALAPPDATA%
+	MB_CACHE ?= %LOCALAPPDATA%
 else
 	MB_RM = rm -f
 	MB_RMDIR = rm -rf
@@ -15,7 +15,7 @@ else
 	MB_COPY = cp
 	MB_ERRIGNORE = 2>/dev/null
 	MB_SEP=/
-	MB_CACHE=~/.cache
+	MB_CACHE ?= ~/.cache
 endif
 
 # Remove space after separator
diff --git a/lib/make/mb_msxhub.mk b/lib/make/mb_msxhub.mk
index c0aef2a..94e8f78 100644
--- a/lib/make/mb_msxhub.mk
+++ b/lib/make/mb_msxhub.mk
@@ -1,5 +1,4 @@
 
-MB_CACHE        ?=~/.cache
 MB_MSXHUB_API   ?= https://msxhub.com/api
 MB_MSXHUB_CACHE ?= $(MB_CACHE)/msxhub/repro-v0
 MB_MSXHUB_WGET  ?= wget
diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk
index aebafa8..bd9c2d0 100644
--- a/lib/make/mb_openmsx.mk
+++ b/lib/make/mb_openmsx.mk
@@ -13,14 +13,14 @@ MB_OPENMSX_JOYPORTB     ?=
 MB_OPENMSX_SCALE_FACTOR ?= 3
 MB_OPENMSX_THROTTLE     ?= off
 MB_OPENMSX_RENDERER     ?=
-MB_OPENMSX_CTL_CACHE    ?= ~/.openMSX/share/omsxctl
+MB_OPENMSX_CTLCACHE     ?= $(MB_CACHE)/omsxctl
 MB_OPENMSX_SAVE_ON_EXIT ?= off
 
 # TODO: create openMSX issue to control extensions from the command line.
 define _mb_openmsx_setup
-	$(if $(wildcard $(MB_OPENMSX_CTL_CACHE)),,$(call mb_mkdir,$(MB_OPENMSX_CTL_CACHE)))
-	$(call mb_msxhub_file,$(MB_OPENMSX_CTL_CACHE),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl)
-	$(call mb_msxhub_file,$(MB_OPENMSX_CTL_CACHE),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.com)
+	$(if $(wildcard $(MB_OPENMSX_CTLCACHE)),,$(call mb_mkdir,$(MB_OPENMSX_CTLCACHE)))
+	$(call mb_msxhub_file,$(MB_OPENMSX_CTLCACHE),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl)
+	$(call mb_msxhub_file,$(MB_OPENMSX_CTLCACHE),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.com)
 	$(if $(wildcard ~/.openMSX/share/extensions/ide-nextor.xml),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/ide-nextor.xml,~/.openMSX/share/extensions/))
 endef
 
@@ -44,7 +44,7 @@ define _mb_openmsx_run
 		$(MB_OPENMSX_EXTRA_HDD) \
 		$(MB_OPENMSX_EXTRA_MEM) \
 		$(MB_OPENMSX_EXTS) \
-		-script $(MB_OPENMSX_CTL_CACHE)/omsxctl.tcl \
+		-script $(MB_OPENMSX_CTLCACHE)/omsxctl.tcl \
 		-script $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_env.tcl \
 		-script $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_hdd.tcl \
 		-script $(PATH_MSXBUILD_REAL)/lib/openmsx/fail_after.tcl \
@@ -53,7 +53,7 @@ define _mb_openmsx_run
 endef
 
 define mb_openmsx_dosctl
-	$(if $(wildcard $(MB_OPENMSX_CTL_CACHE)/omsxctl.tcl),,$(call _mb_openmsx_setup))
-	$(if $(wildcard $(1)/omsxctl.com),,$(call mb_copy,$(MB_OPENMSX_CTL_CACHE)/omsxctl.com,$(1)))
+	$(if $(wildcard $(MB_OPENMSX_CTLCACHE)/omsxctl.tcl),,$(call _mb_openmsx_setup))
+	$(if $(wildcard $(1)/omsxctl.com),,$(call mb_copy,$(MB_OPENMSX_CTLCACHE)/omsxctl.com,$(1)))
 	$(call _mb_openmsx_run,$(1))
 endef
diff --git a/lib/make/mb_packages.mk b/lib/make/mb_packages.mk
index 8e51354..9320b82 100644
--- a/lib/make/mb_packages.mk
+++ b/lib/make/mb_packages.mk
@@ -1,7 +1,7 @@
 # MSXHUB fetch package files functions
 define mb_package_emuctl
-	$(call mb_copy,$(PATH_MSXBUILD)/lib/emuctl/shutdown.bat,$(1))
-	$(call mb_copy,$(PATH_MSXBUILD)/lib/emuctl/z80.bat,$(1))
+	$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/shutdown.bat,$(1))
+	$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/z80.bat,$(1))
 endef
 
 #