Mercurial > hg > dmlib
changeset 2568:8ab923fe23ef
Add Make parameter/variable CHARGEN= for easier defining of
the chargen ROM file path.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Wed, 02 Mar 2022 00:04:30 +0200 |
| parents | b205c60aa657 |
| children | b4d536379687 |
| files | Makefile Makefile.cross-mingw |
| diffstat | 2 files changed, 24 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Feb 28 12:03:23 2022 +0200 +++ b/Makefile Wed Mar 02 00:04:30 2022 +0200 @@ -23,8 +23,22 @@ ZLIB_CFLAGS ?= $(shell pkg-config --cflags zlib) ZLIB_LDFLAGS ?= $(shell pkg-config --libs zlib) +# NOTE! If you want to define the default path for C64 chargen +# ROM image file, you can set it with this define and/or Make +# parameter. Do take note of the somewhat peculiar quotation and +# escape of backlash '\'. Example: (notice the single quotes) +# +# make CHARGEN='/usr/local/share/vice/C64/chargen' +# +# If not specified, the shellscript findchargen.sh will be +# run to detect if the file can be found from VICE installations. +# +ifneq ($(CHARGEN),) +CFLAGS += -DDM_DEF_CHARGEN='"$(CHARGEN)"' +else FINDCHARGEN := $(shell sh $(DMLIB)/tools/findchargen.sh) CFLAGS += $(FINDCHARGEN) +endif TOOL_LDFLAGS ?=
--- a/Makefile.cross-mingw Mon Feb 28 12:03:23 2022 +0200 +++ b/Makefile.cross-mingw Wed Mar 02 00:04:30 2022 +0200 @@ -15,10 +15,17 @@ # # NOTE! If you want to define the default path for C64 chargen -# ROM image file, you can set it with this define. Do take note of -# the somewhat peculiar quotation and escape of backlash '\', these -# are REQUIRED. +# ROM image file, you can set it with this define and/or Make +# parameter. Do take note of the somewhat peculiar quotation and +# escape of backlash '\'. Example: (notice the single quotes) +# +# make -f Makefile.cross-mingw CHARGEN='C:\\VICE-3.5\\C64\\chargen' +# +ifneq ($(CHARGEN),) +CFLAGS += -DDM_DEF_CHARGEN='"$(CHARGEN)"' +else CFLAGS += -DDM_DEF_CHARGEN='"C:\\VICE-3.5\\C64\\chargen"' +endif ifeq ($(MINGW),64)