Deleted setting and added scale factor override.

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

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"

lib/openmsx/boot_settings.xml

@@ -1,9 +0,0 @@
-<!DOCTYPE settings SYSTEM 'settings.dtd'>
-<settings>
-	<settings>
-		<setting id="save_settings_on_exit">false</setting>
-		<setting id="scale_factor">3</setting>
-		<setting id="speed">333</setting>
-	</settings>
-	<bindings/>
-</settings>

lib/openmsx/boot_stdio.xml

@@ -5,4 +5,5 @@ It starts then in power off mode and without renderer for fast booting.
 -->
 	<command>set power on</command>
 	<command>set throttle off</command>
+	<command>set save_settings_on_exit off</command>
 </openmsx-control>