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

Fixed dos1 and msx1 runs.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in -4s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-06-27 19:09:38 +02:00
parent 567f91be78
commit 80f751cfea
11 changed files with 63 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

48
lib/make/mb_autoexec.mk
View file

@ -20,9 +20,9 @@ define mb_autoexec_append_rem
endef
define mb_autoexec_append_gui_mode
$(call mb_autoexec_append_echo,$(1),Enabling SDL renderer.)
$(call mb_autoexec_append_cmd,$(1),omsxctl set renderer SDL > NUL)
$(call mb_autoexec_append_cmd,$(1),omsxctl set renderer SDL)
$(call mb_autoexec_append_echo,$(1),Enabling CPU throttling.)
$(call mb_autoexec_append_cmd,$(1),omsxctl set throttle on > NUL)
$(call mb_autoexec_append_cmd,$(1),omsxctl set throttle on)
endef
define mb_autoexec_append_stop_fail
$(call mb_autoexec_append_echo,$(1),Disabling automatic failure.)
@ -42,37 +42,45 @@ define mb_autoexec_append_safe_cmd
$(call mb_autoexec_append_cmd,$(1),$(2))
endef
define mb_autoexec_write_default
echo -n "" > $(1)/autoexec.bat
$(if $(filter 40,$(2)),$(call mb_autoexec_append_cmd,$(1),mode $(2)),$(call mb_autoexec_append_cmd,$(1),mode 80))
$(if $(filter 40,$(2)),$(call mb_autoexec_append_echo,$(1),Enabled mode $(2).),$(call mb_autoexec_append_echo,$(1),Enabled mode 80.))
@echo === Writing autoexec.bat for $(notdir $(1))
@echo -n "" > $(1)/autoexec.bat
$(if $(filter 40,$(2)),$(call mb_autoexec_append_cmd,$(1),mode 40),$(call mb_autoexec_append_cmd,$(1),mode 80))
$(if $(filter 40,$(2)),$(call mb_autoexec_append_echo,$(1),Enabled mode 40.),$(call mb_autoexec_append_echo,$(1),Enabled mode 80.))
$(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_STARTUP_TIMEOUT) seconds failed_exec $(MB_AUTOEXEC_STARTUP_EXITCODE))
$(call mb_autoexec_append_cmd,$(1),omsxctl setcolor 4 000 > NUL)
$(call mb_autoexec_append_cmd,$(1),omsxctl setcolor 15 777 > NUL)
$(call mb_autoexec_append_cmd,$(1),omsxctl setcolor 4 000)
$(call mb_autoexec_append_cmd,$(1),omsxctl setcolor 15 777)
$(if $(filter true,$(MB_AUTOEXEC_VERSION)),$(call mb_autoexec_append_cmd,$(1),ver))
$(if $(filter true,$(MB_AUTOEXEC_BYSELF)),$(call mb_autoexec_append_echo,$(1),$(MB_AUTOEXEC_BYSELF_MSG) $(notdir $(1))))
endef
define mb_autoexec_open_gui
@echo === Generating autoexec.bat for command with gui
$(call mb_autoexec_write_default,$(1))
define _mb_autoexec_open_gui
$(call mb_autoexec_write_default,$(1),$(2))
$(call mb_autoexec_append_stop_fail,$(1))
$(call mb_autoexec_append_gui_mode,$(1))
$(call mb_autoexec_append_echo,$(1),Type shutdown to stop emulation.)
$(if $(3),$(call mb_autoexec_append_echo,$(1),Running command '$(3)'))
$(if $(3),$(call mb_autoexec_append_cmd,$(1),$(3)))
endef
define mb_autoexec_open_gui_cmd
$(call mb_autoexec_open_gui,$(1))
$(call mb_autoexec_append_echo,$(1),Running command '$(2)')
$(call mb_autoexec_append_cmd,$(1),$(2))
define mb_autoexec_open_gui40
$(call _mb_autoexec_open_gui,$(1),40)
endef
define mb_autoexec_cmd
@echo === Generating autoexec.bat for command
$(call mb_autoexec_write_default,$(1))
define mb_autoexec_open_gui40_cmd
$(call _mb_autoexec_open_gui,$(1),40,$(2))
endef
define mb_autoexec_open_gui80
$(call _mb_autoexec_open_gui,$(1),80)
endef
define mb_autoexec_open_gui80_cmd
$(call _mb_autoexec_open_gui,$(1),80,$(2))
endef
define mb_autoexec_safe_cmd
$(call mb_autoexec_write_default,$(1),$(3))
$(call mb_autoexec_append_safe_cmd,$(1),$(2))
$(call mb_autoexec_append_exit,$(1))
endef
define mb_autoexec_cmd_test
@echo === Generating autoexec.bat for command test
$(call mb_autoexec_write_default,$(1))
define mb_autoexec_safe_test
$(call mb_autoexec_write_default,$(1),$(3))
$(call mb_autoexec_append_safe_test,$(1),$(2))
$(call mb_autoexec_append_exit,$(1))
endef

1
lib/make/mb_msxrom.mk
View file

@ -1,4 +1,5 @@
# TODO: Convert pi MSX number data, the named pie slices to hyperdrive storage for distribution over red sea
MB_MSXROM_API ?= https://msxrom.distributedrebirth.love/calc-pi/v19.1
MB_MSXROM_CACHE ?= $(MB_CACHE)/msxbuild/msxrom

9
lib/make/mb_openmsx.mk
View file

@ -1,7 +1,7 @@
MB_OPENMSX_PATH_BIN ?= bin
MB_OPENMSX_BOOT_TIMEOUT ?= 25
MB_OPENMSX_MACHINE_DEF ?= Philips_NMS_8250
MB_OPENMSX_MACHINE ?= Philips_NMS_8250
MB_OPENMSX_SPEED ?= $(if $(findstring turboR,$(MB_OPENMSX_MACHINE)),100,333)
MB_OPENMSX_EXTS ?=
MB_OPENMSX_EXTRA_SLOT ?= -ext slotexpander
@ -34,7 +34,7 @@ define mb_openmsx_setup
endef
define _mb_openmsx_run
@echo === Running openMSX
@echo === openMSX Start for $(notdir $(1))
FAIL_AFTER_BOOT=$(MB_OPENMSX_BOOT_TIMEOUT) \
FAIL_AFTER_PATH=$(MB_OPENMSX_PATH_BIN) \
BOOT_HDD_PATH="$(1)" \
@ -54,10 +54,11 @@ define _mb_openmsx_run
$(MB_OPENMSX_EXTRA_MEM) \
$(MB_OPENMSX_EXTS) \
-control stdio < $(1)-omsx/stdio.xml
@echo === openMSX Done for $(notdir $(1))
endef
define mb_openmsx_dosctl
$(call mb_openmsx_setup,$(1),$(if $(2),$(2),$(MB_OPENMSX_MACHINE_DEF)))
$(if $(wildcard $(1)-omsx),,$(call mb_openmsx_setup,$(1),$(if $(2),$(2),$(MB_OPENMSX_MACHINE))))
$(if $(wildcard $(1)/omsxctl.com),,$(call mb_copy,$(MB_OPENMSX_CTLCACHE)/omsxctl.com,$(1)))
$(call _mb_openmsx_run,$(1),$(if $(2),$(2),$(MB_OPENMSX_MACHINE_DEF)))
$(call _mb_openmsx_run,$(1),$(if $(2),$(2),$(MB_OPENMSX_MACHINE)))
endef