From 6f5aa06fb30ab284df121a178eeb0db1545b35e5 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Fri, 21 Mar 2025 18:50:49 -0700 Subject: [PATCH] Improve cpmtools Makefile, Issue #505 See issue #505. This change should improve build compatibility if there are multiple variants of ncurses installed. Thanks and credit to @mabartibin. Co-Authored-By: mabartibin <16798058+mabartibin@users.noreply.github.com> --- Tools/unix/cpmtools/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tools/unix/cpmtools/Makefile b/Tools/unix/cpmtools/Makefile index 61d92b6c..4960ac11 100644 --- a/Tools/unix/cpmtools/Makefile +++ b/Tools/unix/cpmtools/Makefile @@ -15,8 +15,9 @@ DEFFORMAT=wbw_fd144 # Locate the ncurses libs or try a guess if pkg-config does not exist NCURSESLIBS=$(shell if env pkg-config --libs ncurses ; then : ; else echo -lncurses ; fi) +NCURSESCFLAGS=$(shell if env pkg-config --cflags ncurses ; then : ; fi) -CPPFLAGS = -DDISKDEFS=\"$(DISKDEFS)\" -DFORMAT=\"$(DEFFORMAT)\" +CPPFLAGS = -DDISKDEFS=\"$(DISKDEFS)\" -DFORMAT=\"$(DEFFORMAT)\" $(NCURSESCFLAGS) DEVICEOBJ = device_posix.o