arch-msx/msxbuild
2
0
Fork 0
Code Issues Pull requests 3 Actions Activity

Split headless and renderer vars.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in -7s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-06-29 05:07:15 +02:00
parent 807b32f92c
commit 97088650d4
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -55,15 +55,15 @@ When you want to see whats happening do a debug run;
real 0m3.223s real 0m3.223s
debug run at 11 Mhz; debug run at 11 Mhz;
time MB_OPENMSX_RENDERER=on MB_OPENMSX_THROTTLE=on make assert-all time MB_OPENMSX_HEADLESS=off MB_OPENMSX_THROTTLE=on make assert-all
real 0m49.609s real 1m4.856s
debug run real msx speed; debug run real msx speed;
time MB_OPENMSX_RENDERER=on MB_OPENMSX_THROTTLE=on MB_OPENMSX_SPEED=100 make assert-all time MB_OPENMSX_HEADLESS=off MB_OPENMSX_THROTTLE=on MB_OPENMSX_SPEED=100 make assert-all
real 2m37.379s real 2m37.379s
debug run with video recorder and merge to one video file; debug run with video recorder and merge to one video file;
time MB_OPENMSX_RENDERER=on MB_OPENMSX_RECORDER=on make -s assert-all-video time MB_OPENMSX_HEADLESS=off MB_OPENMSX_RECORDER=on make -s assert-all-video
real 0m7.136s real 0m7.136s
build parallel; build parallel;

6
lib/make/mb_openmsx.mk
View file

@ -11,8 +11,8 @@ MB_OPENMSX_EXTRA_HDD ?= -ext ide-nextor
MB_OPENMSX_HDD_SIZE ?= 4m MB_OPENMSX_HDD_SIZE ?= 4m
MB_OPENMSX_SCALE_FACTOR ?= 3 MB_OPENMSX_SCALE_FACTOR ?= 3
MB_OPENMSX_THROTTLE ?= off MB_OPENMSX_THROTTLE ?= off
MB_OPENMSX_RENDERER ?= off MB_OPENMSX_HEADLESS ?= on
MB_OPENMSX_RENDERER_TYPE ?= SDL MB_OPENMSX_RENDERER ?= SDL
MB_OPENMSX_RECORDER ?= off MB_OPENMSX_RECORDER ?= off
MB_OPENMSX_CTLCACHE ?= $(MB_CACHE)/msxbuild/omsxctl MB_OPENMSX_CTLCACHE ?= $(MB_CACHE)/msxbuild/omsxctl
@ -45,8 +45,8 @@ define _mb_openmsx_run
BOOT_HDD_IMAGE="$(1)-omsx/persistent/ide-nextor/untitled1/hd.dsk" \ BOOT_HDD_IMAGE="$(1)-omsx/persistent/ide-nextor/untitled1/hd.dsk" \
SCALE_FACTOR=$(MB_OPENMSX_SCALE_FACTOR) \ SCALE_FACTOR=$(MB_OPENMSX_SCALE_FACTOR) \
SPEED=$(MB_OPENMSX_SPEED) \ SPEED=$(MB_OPENMSX_SPEED) \
HEADLESS=$(MB_OPENMSX_HEADLESS) \
RENDERER=$(MB_OPENMSX_RENDERER) \ RENDERER=$(MB_OPENMSX_RENDERER) \
RENDERER_TYPE=$(MB_OPENMSX_RENDERER_TYPE) \
THROTTLE=$(MB_OPENMSX_THROTTLE) \ THROTTLE=$(MB_OPENMSX_THROTTLE) \
RECORDER=$(if $(filter on,$(MB_OPENMSX_RECORDER)),msxbuild-) \ RECORDER=$(if $(filter on,$(MB_OPENMSX_RECORDER)),msxbuild-) \
OPENMSX_HOME="$(1)-omsx" \ OPENMSX_HOME="$(1)-omsx" \

16
lib/openmsx/share/scripts/boot_env.tcl
View file

@ -9,11 +9,11 @@
# #
# Supported environment variables by this script; # Supported environment variables by this script;
# #
# RENDERER=on|off # HEADLESS=on|off
# Override video output from command line. # Override video output from command line.
# #
# RENDERER_TYPE=SDL # RENDERER=SDL
# Select video renderer type. # Select video renderer type for gui mode or in none headless mode.
# #
# SCALE_FACTOR=3 # SCALE_FACTOR=3
# Override video scale factor for SDL renderer. # Override video scale factor for SDL renderer.
@ -37,7 +37,7 @@ proc boot_gui_mode {} {
set renderer $boot_env_renderer_type set renderer $boot_env_renderer_type
set throttle on set throttle on
} else { } else {
puts stderr "error: Requested boot_gui_mode but env.RENDERER_TYPE is missing." puts stderr "error: Requested boot_gui_mode but env.RENDERER is missing."
exit 1 exit 1
} }
} }
@ -45,13 +45,13 @@ proc boot_gui_mode {} {
# Globals # Globals
set boot_env_renderer_type 0 set boot_env_renderer_type 0
if {[info exists ::env(RENDERER_TYPE)] && ([string trim $::env(RENDERER_TYPE)] != "")} { if {[info exists ::env(RENDERER)] && ([string trim $::env(RENDERER)] != "")} {
set boot_env_renderer_type [string trim $::env(RENDERER_TYPE)] set boot_env_renderer_type [string trim $::env(RENDERER)]
} }
if {[info exists ::env(RENDERER)] && ([string trim $::env(RENDERER)] == "on")} { if {[info exists ::env(HEADLESS)] && ([string trim $::env(HEADLESS)] != "on")} {
if {[catch {set renderer $boot_env_renderer_type} err_msg]} { if {[catch {set renderer $boot_env_renderer_type} err_msg]} {
puts stderr "error: env.RENDERER value $err_msg" puts stderr "error: env.HEADLESS value $err_msg"
exit 1 exit 1
} }
} }