Cleanup of path variables.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 0s

This commit is contained in:
Willem Cazander 2024-06-25 15:57:13 +02:00
parent 5ce923b3fb
commit 230331d9a5
6 changed files with 8 additions and 23 deletions

View file

@ -20,7 +20,6 @@ BUILD_HELP += \\n\\t* clean
clean:
$(call mb_clean,$(PATH_BIN))
-include Makelocal.mk
MB_OPENMSX_PATH_BIN ?= $(PATH_BIN)
include lib/make/msxbuild.mk
include $(INC_TEST)

View file

@ -1,8 +0,0 @@
# Local included makefile fragment.
# Save this file without tpl suffix and custumize it.
#
# Change to local installations if needed;
#PATH_SDCC ?= /usr/bin
#PATH_UNIX2DOS ?= /usr/bin
#PATH_OPENMSX ?= /opt/openMSX/bin/

View file

@ -29,26 +29,23 @@ The files in this repro try to handle these steps for you.
## Dependencies
* make
* openmsx
* make + wget + tar + dos2unix
* sdcc
* wget
* unix2dos
* openmsx
For debian use;
apt-get install make openmsx wget dos2unix sdcc
apt-get install make wget tar dos2unix sdcc openmsx
## Usage
Include the `lib/make/msxbuild.mk` file from your Makefile.
And override the required paths;
And override the paths if needed;
* PATH_SDCC ?= /usr/bin
* PATH_UNIX2DOS ?= /usr/bin
* PATH_OPENMSX ?= /usr/bin
* PATH_MSXBUILD ?= /opt/msxbuild
Then build result based compile rules see an example in; `test/ahello-m80/0module.mk`
When you want to see whats happening do a debug run;
normal run;

View file

@ -8,14 +8,13 @@ MB_BUILD_SDCC_CMD ?= $(PATH_SDCC)/sdcc
MB_BUILD_SDASM_CMD ?= $(PATH_SDCC)/sdasz80
MB_BUILD_SDAR_CMD ?= $(PATH_SDCC)/sdar
MB_BUILD_SDOBJCOPY_CMD ?= $(PATH_SDCC)/sdobjcopy
MB_BUILD_UNIX2DOS_CMD ?= $(PATH_UNIX2DOS)/unix2dos
# TODO: Add C + mixed support;
#$(MB_SDASM) -I$(MB_LIBASM_SRC)/include
#-l$(LIBASM_LINK)
define mb_unix2dos
$(MB_BUILD_UNIX2DOS_CMD) -n $(1) $(2)
unix2dos -n $(1) $(2)
endef
define mb_compile_asm

View file

@ -1,7 +1,6 @@
MB_MSXHUB_API ?= https://msxhub.com/api
MB_MSXHUB_CACHE ?= $(MB_CACHE)/msxhub/repro-v0
MB_MSXHUB_WGET ?= wget
# NOTE: with HDD import/export we get duplicate files after openMSX run, so force to lowercase.
define _mb_lowercase
@ -11,7 +10,7 @@ endef
define _mb_msxhub_file_fetch
@echo === Fetch msxhub file
$(if $(wildcard $(dir $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1)))),,$(call mb_mkdir,$(dir $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1)))))
$(if $(wildcard $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1))),,$(MB_MSXHUB_WGET) -O $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1)) $(1))
$(if $(wildcard $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1))),,wget -O $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1)) $(1))
endef
define mb_msxhub_file

View file

@ -4,7 +4,6 @@
# Setup required tools paths
PATH_SDCC ?= /usr/bin
PATH_UNIX2DOS ?= /usr/bin
PATH_OPENMSX ?= /usr/bin
PATH_MSXBUILD ?= $(dir $(lastword $(MAKEFILE_LIST)))../..
PATH_MSXBUILD_REAL := $(if $(realpath $(PATH_MSXBUILD)),$(realpath $(PATH_MSXBUILD)),$(PATH_MSXBUILD))