diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk index b27abb1..fcab214 100644 --- a/lib/make/mb_openmsx.mk +++ b/lib/make/mb_openmsx.mk @@ -1,14 +1,13 @@ MB_OPENMSX_BOOT_TIMEOUT ?= 25 MB_OPENMSX_MACHINE ?= Philips_NMS_8250 -MB_OPENMSX_SETTING := $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_settings.xml MB_OPENMSX_SPEED ?= $(if $(findstring turboR,$(OPENMSX_ARGS)),100,333) MB_OPENMSX_EXTS ?= MB_OPENMSX_EXTRA_MEM ?= -ext ram4mb MB_OPENMSX_JOYPORTA ?= MB_OPENMSX_JOYPORTB ?= +MB_OPENMSX_SCALE_FACTOR ?= 3 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_REAL)/lib/openmsx/boot_env.tcl \ @@ -31,6 +30,7 @@ define _mb_openmsx_run BOOT_HDD_IMAGE="$(1)/../dsk.img" \ JOYPORTA=$(MB_OPENMSX_JOYPORTA) \ JOYPORTB=$(MB_OPENMSX_JOYPORTB) \ + SCALE_FACTOR=$(MB_OPENMSX_SCALE_FACTOR) \ SPEED=$(MB_OPENMSX_SPEED) \ $(MB_OPENMSX_CMD) endef diff --git a/lib/openmsx/boot_env.tcl b/lib/openmsx/boot_env.tcl index 8d2e6d0..b26216e 100644 --- a/lib/openmsx/boot_env.tcl +++ b/lib/openmsx/boot_env.tcl @@ -36,6 +36,13 @@ if {[info exists ::env(RENDERER)] && ([string trim $::env(RENDERER)] != "")} { } } +if {[info exists ::env(SCALE_FACTOR)] && ([string trim $::env(SCALE_FACTOR)] != "")} { + if {[catch {set scale_factor [string trim $::env(SCALE_FACTOR)]} err_msg]} { + puts stderr "error: env.SCALE_FACTOR value $err_msg" + exit 1 + } +} + if {[info exists ::env(THROTTLE)] && ([string trim $::env(THROTTLE)] != "")} { if {[catch {set throttle [string trim $::env(THROTTLE)]} err_msg]} { puts stderr "error: env.THROTTLE value $err_msg" diff --git a/lib/openmsx/boot_settings.xml b/lib/openmsx/boot_settings.xml deleted file mode 100644 index 738e8ac..0000000 --- a/lib/openmsx/boot_settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - false - 3 - 333 - - - diff --git a/lib/openmsx/boot_stdio.xml b/lib/openmsx/boot_stdio.xml index 54a14bf..04e88f5 100644 --- a/lib/openmsx/boot_stdio.xml +++ b/lib/openmsx/boot_stdio.xml @@ -5,4 +5,5 @@ It starts then in power off mode and without renderer for fast booting. --> set power on set throttle off + set save_settings_on_exit off