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

Removed hex2bin dep
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 3s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-06-24 13:36:26 +02:00
parent 9dd8b1e4ce
commit 41e310b5cd
5 changed files with 16 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.forgejo/workflows/run-test-asserts.yaml
View file

@ -11,4 +11,4 @@ jobs:
- name: Check out - name: Check out
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Run asserts - name: Run asserts
run: PATH_HEX2BIN=/opt/Hex2bin-2.5 make assert-all; run: make assert-all;

7
README.md
View file

@ -32,7 +32,6 @@ The files in this repro try to handle these steps for you.
* make * make
* openmsx * openmsx
* sdcc * sdcc
* hex2bin-2.5 (see [https://hex2bin.sourceforge.net/](https://hex2bin.sourceforge.net/))
* wget * wget
* unix2dos * unix2dos
@ -45,12 +44,11 @@ For debian use;
Include the `lib/make/msxbuild.mk` file from your Makefile. Include the `lib/make/msxbuild.mk` file from your Makefile.
And override the required paths; And override the required paths;
* PATH_SDCC ?= /usr/bin * PATH_SDCC ?= /usr/bin
* PATH_HEX2BIN ?= /usr/bin
* PATH_UNIX2DOS ?= /usr/bin * PATH_UNIX2DOS ?= /usr/bin
* PATH_OPENMSX ?= /opt/openMSX/bin/ * PATH_OPENMSX ?= /opt/openMSX/bin/
* PATH_MSXBUILD ?= /opt/msxbuild * PATH_MSXBUILD ?= /opt/msxbuild
Then build result based compile rules see an example in; `test/ahello/0module.mk` Then build result based compile rules see an example in; `test/ahello-m80/0module.mk`
## Functions ## Functions
@ -67,8 +65,7 @@ Current set is WIP.
* mb_link_asm_8000 * mb_link_asm_8000
* mb_link_asm_C000 * mb_link_asm_C000
* mb_link_asm_dos = alias for mb_link_asm_0100 * mb_link_asm_dos = alias for mb_link_asm_0100
* mb_hex2com * mb_hex2bin
* mb_hex2dat
* mb_openmsx_dosctl * mb_openmsx_dosctl
* mb_msxhub_file * mb_msxhub_file
* mb_package_dos1 * mb_package_dos1

11
lib/make/mb_build.mk
View file

@ -4,10 +4,10 @@ MB_BUILD_FLAG_LD ?= --nostdinc
MB_BUILD_SDASM_FLAGS ?= -g -l -c -o MB_BUILD_SDASM_FLAGS ?= -g -l -c -o
MB_BUILD_SDCC_FLAGS ?= MB_BUILD_SDCC_FLAGS ?=
MB_BUILD_SDAR_FLAGS ?= -rc MB_BUILD_SDAR_FLAGS ?= -rc
MB_BUILD_H2B_CMD ?= $(PATH_HEX2BIN)/hex2bin
MB_BUILD_SDCC_CMD ?= $(PATH_SDCC)/sdcc MB_BUILD_SDCC_CMD ?= $(PATH_SDCC)/sdcc
MB_BUILD_SDASM_CMD ?= $(PATH_SDCC)/sdasz80 MB_BUILD_SDASM_CMD ?= $(PATH_SDCC)/sdasz80
MB_BUILD_SDAR_CMD ?= $(PATH_SDCC)/sdar MB_BUILD_SDAR_CMD ?= $(PATH_SDCC)/sdar
MB_BUILD_SDOBJCOPY_CMD ?= $(PATH_SDCC)/sdobjcopy
MB_BUILD_UNIX2DOS_CMD ?= $(PATH_UNIX2DOS)/unix2dos MB_BUILD_UNIX2DOS_CMD ?= $(PATH_UNIX2DOS)/unix2dos
# TODO: Add C + mixed support; # TODO: Add C + mixed support;
@ -54,11 +54,6 @@ define mb_link_asm_dos
$(call mb_link_asm_0100,$(1),$(2)) $(call mb_link_asm_0100,$(1),$(2))
endef endef
define mb_hex2com define mb_hex2bin
@echo === Extracting hex2com $(MB_BUILD_SDOBJCOPY_CMD) -I ihex --output-target=binary $(1) $(2)
cd $(dir $(1)) && $(MB_BUILD_H2B_CMD) -e com $(notdir $(1))
endef
define mb_hex2dat
@echo === Extracting hex2dat
cd $(dir $(1)) && $(MB_BUILD_H2B_CMD) -e dat $(notdir $(1))
endef endef

1
lib/make/msxbuild.mk
View file

@ -3,7 +3,6 @@
# #
# Setup required tools paths # Setup required tools paths
PATH_HEX2BIN ?= /usr/bin
PATH_SDCC ?= /usr/bin PATH_SDCC ?= /usr/bin
PATH_UNIX2DOS ?= /usr/bin PATH_UNIX2DOS ?= /usr/bin
PATH_OPENMSX ?= /usr/bin PATH_OPENMSX ?= /usr/bin

2
test/ahello-sdcc/0module.mk
View file

@ -14,7 +14,7 @@ $(TEST_AHELLO_SDCC)/ahello.hex: $(TEST_AHELLO_SDCC)/ahello.rel
$(call mb_link_asm_dos,$(TEST_AHELLO_SDCC)/ahello.hex,$(TEST_AHELLO_SDCC)/ahello.rel) $(call mb_link_asm_dos,$(TEST_AHELLO_SDCC)/ahello.hex,$(TEST_AHELLO_SDCC)/ahello.rel)
$(TEST_AHELLO_SDCC)/ahello.com: $(TEST_AHELLO_SDCC)/ahello.hex $(TEST_AHELLO_SDCC)/ahello.com: $(TEST_AHELLO_SDCC)/ahello.hex
$(call mb_hex2com,$(TEST_AHELLO_SDCC)/ahello.hex,$(TEST_AHELLO_SDCC)/ahello.com) $(call mb_hex2bin,$(TEST_AHELLO_SDCC)/ahello.hex,$(TEST_AHELLO_SDCC)/ahello.com)
.PHONY: test-ahello-sdcc-run .PHONY: test-ahello-sdcc-run
test-ahello-sdcc-run: $(TEST_AHELLO_SDCC)/ahello.com test-ahello-sdcc-run: $(TEST_AHELLO_SDCC)/ahello.com