diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk index 4427f30..099615e 100644 --- a/lib/make/mb_openmsx.mk +++ b/lib/make/mb_openmsx.mk @@ -3,24 +3,23 @@ MB_OPENMSX_BOOT_TIMEOUT ?= 25 MB_OPENMSX_MACHINE ?= Philips_NMS_8250 MB_OPENMSX_JOYPORTA ?= MB_OPENMSX_JOYPORTB ?= -# Workaround for include msxbuild.mk file and 'older' openmsx segfaults on relative settings path. -MB_OPENMSX_SETTING := $(if $(realpath $(PATH_MSXBUILD)),$(realpath $(PATH_MSXBUILD)),$(PATH_MSXBUILD))/lib/openmsx/boot_settings.xml +MB_OPENMSX_SETTING := $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_settings.xml MB_OPENMSX_EXTS ?= MB_OPENMSX_EXTRA_MEM ?= -ext ram4mb MB_OPENMSX_ARGS = \ -setting $(MB_OPENMSX_SETTING) \ -machine $(MB_OPENMSX_MACHINE) \ -ext slotexpander -ext ide $(MB_OPENMSX_EXTRA_MEM) $(MB_OPENMSX_EXTS) \ - -script $(PATH_MSXBUILD)/lib/openmsx/boot_env.tcl \ - -script $(PATH_MSXBUILD)/lib/openmsx/boot_hdd.tcl \ - -script $(PATH_MSXBUILD)/lib/openmsx/fail_after.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 \ -script $(MB_MSXHUB_CACHE)/OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl # TODO: add run flag to disable xml output like "-control stdio-boot-only" ifeq ($(OS),Windows_NT) - MB_OPENMSX_CMD = $(PATH_OPENMSX)/openmsx $(MB_OPENMSX_ARGS) -control stdio < $(PATH_MSXBUILD)/lib/openmsx/boot_stdio.xml + MB_OPENMSX_CMD = $(PATH_OPENMSX)/openmsx $(MB_OPENMSX_ARGS) -control stdio < $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_stdio.xml else - MB_OPENMSX_CMD = $(PATH_OPENMSX)/openmsx $(MB_OPENMSX_ARGS) -control stdio < $(PATH_MSXBUILD)/lib/openmsx/boot_stdio.xml | sed -n -e 's/.*>\(.*\)<.*/\1/p' | tail -n+3 + MB_OPENMSX_CMD = $(PATH_OPENMSX)/openmsx $(MB_OPENMSX_ARGS) -control stdio < $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_stdio.xml | sed -n -e 's/.*>\(.*\)<.*/\1/p' | tail -n+3 endif define _mb_openmsx_run @echo === Running openMSX diff --git a/lib/make/msxbuild.mk b/lib/make/msxbuild.mk index bd39ef8..2a658e9 100644 --- a/lib/make/msxbuild.mk +++ b/lib/make/msxbuild.mk @@ -3,11 +3,12 @@ # # Setup required tools paths -PATH_HEX2BIN ?= /usr/bin -PATH_SDCC ?= /usr/bin -PATH_UNIX2DOS ?= /usr/bin -PATH_OPENMSX ?= /usr/bin -PATH_MSXBUILD ?= $(dir $(lastword $(MAKEFILE_LIST)))../.. +PATH_HEX2BIN ?= /usr/bin +PATH_SDCC ?= /usr/bin +PATH_UNIX2DOS ?= /usr/bin +PATH_OPENMSX ?= /usr/bin +PATH_MSXBUILD ?= $(dir $(lastword $(MAKEFILE_LIST)))../.. +PATH_MSXBUILD_REAL := $(if $(realpath $(PATH_MSXBUILD)),$(realpath $(PATH_MSXBUILD)),$(PATH_MSXBUILD)) # Include features include $(PATH_MSXBUILD)/lib/make/mb_base.mk