Fixed hardcoded bin path and allow for partial parallel build.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 1s

This commit is contained in:
Willem Cazander 2024-06-25 13:05:20 +02:00
parent 00d9c59bdb
commit 3279b91d39
2 changed files with 4 additions and 2 deletions

View file

@ -21,5 +21,6 @@ clean:
$(call mb_clean,$(PATH_BIN)) $(call mb_clean,$(PATH_BIN))
-include Makelocal.mk -include Makelocal.mk
MB_OPENMSX_PATH_BIN ?= $(PATH_BIN)
include lib/make/msxbuild.mk include lib/make/msxbuild.mk
include $(INC_TEST) include $(INC_TEST)

View file

@ -1,4 +1,5 @@
MB_OPENMSX_PATH_BIN ?= bin
MB_OPENMSX_BOOT_TIMEOUT ?= 25 MB_OPENMSX_BOOT_TIMEOUT ?= 25
MB_OPENMSX_MACHINE ?= Philips_NMS_8250 MB_OPENMSX_MACHINE ?= Philips_NMS_8250
MB_OPENMSX_SPEED ?= $(if $(findstring turboR,$(MB_OPENMSX_MACHINE)),100,333) MB_OPENMSX_SPEED ?= $(if $(findstring turboR,$(MB_OPENMSX_MACHINE)),100,333)
@ -31,9 +32,9 @@ endef
define _mb_openmsx_run define _mb_openmsx_run
@echo === Running openMSX @echo === Running openMSX
FAIL_AFTER_BOOT=$(MB_OPENMSX_BOOT_TIMEOUT) \ FAIL_AFTER_BOOT=$(MB_OPENMSX_BOOT_TIMEOUT) \
FAIL_AFTER_PATH=bin \ FAIL_AFTER_PATH=$(MB_OPENMSX_PATH_BIN) \
BOOT_HDD_PATH="$(1)" \ BOOT_HDD_PATH="$(1)" \
BOOT_HDD_IMAGE="$(1)/../dsk.img" \ BOOT_HDD_IMAGE="$(MB_OPENMSX_PATH_BIN)/dsk-$(notdir $(1)).img" \
JOYPORTA=$(MB_OPENMSX_JOYPORTA) \ JOYPORTA=$(MB_OPENMSX_JOYPORTA) \
JOYPORTB=$(MB_OPENMSX_JOYPORTB) \ JOYPORTB=$(MB_OPENMSX_JOYPORTB) \
SCALE_FACTOR=$(MB_OPENMSX_SCALE_FACTOR) \ SCALE_FACTOR=$(MB_OPENMSX_SCALE_FACTOR) \