From c51efbbf88344f35a9bb6350400edbb0ece867ec Mon Sep 17 00:00:00 2001 From: Bill-Gray Date: Sat, 10 Jun 2023 22:18:27 -0400 Subject: [PATCH] 'terminfo.o' was not included in the DOSVGA Makefile, nor in the WinCon Microsoft(R) makefile. The WinCon Digital Mars makefile said 'term.obj' where it should have said 'terminfo.obj'. Found after a careful check of the reversion of commit 22c4d82f8cd3, which was done in commits d5d2d8a857dba, 248146021e9e4fe and ab1c0072733f. --- dosvga/Makefile | 3 ++- wincon/Makefile.dmc | 2 +- wincon/Makefile.vc | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dosvga/Makefile b/dosvga/Makefile index 3f9fb029..ec9126d2 100644 --- a/dosvga/Makefile +++ b/dosvga/Makefile @@ -65,12 +65,13 @@ $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) $(LIBEXE) $(LIBFLAGS)S $@ addch.o addchstr.o addstr.o attr.o beep.o bkgd.o border.o clear.o color.o debug.o delch.o deleteln.o $(LIBEXE) $(LIBFLAGS)S $@ getch.o getstr.o getyx.o inch.o inchstr.o initscr.o inopts.o insch.o insstr.o instr.o kernel.o keyname.o $(LIBEXE) $(LIBFLAGS)S $@ mouse.o move.o outopts.o overlay.o pad.o panel.o pdcclip.o pdcdisp.o pdcgetsc.o pdckbd.o pdcscrn.o pdcsetsc.o - $(LIBEXE) $(LIBFLAGS) $@ pdcutil.o printw.o refresh.o scanw.o scr_dump.o scroll.o slk.o termattr.o touch.o util.o window.o + $(LIBEXE) $(LIBFLAGS) $@ pdcutil.o printw.o refresh.o scanw.o scr_dump.o scroll.o slk.o termattr.o terminfo.o touch.o util.o window.o $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) $(PDCOBJS) : $(PDCURSES_DOS_H) $(DEMOS) : $(PDCURSES_CURSES_H) $(LIBCURSES) panel.o : $(PANEL_HEADER) +terminfo.o : $(TERM_HEADER) $(LIBOBJS) : %.o: $(srcdir)/%.c $(CC) -c $(CFLAGS) $< diff --git a/wincon/Makefile.dmc b/wincon/Makefile.dmc index 264a66ef..1866e922 100644 --- a/wincon/Makefile.dmc +++ b/wincon/Makefile.dmc @@ -66,7 +66,7 @@ LIBS = winmm.lib $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) $(PDCOBJS) : $(PDCURSES_WIN_H) panel.obj ptest.obj: $(PANEL_HEADER) -term.obj : $(TERM_HEADER) +terminfo.obj : $(TERM_HEADER) $(DEMOOBJS) : $(PDCURSES_CURSES_H) $(DEMOS) : $(LIBCURSES) diff --git a/wincon/Makefile.vc b/wincon/Makefile.vc index 4af5f376..2fb0e499 100644 --- a/wincon/Makefile.vc +++ b/wincon/Makefile.vc @@ -89,6 +89,7 @@ $(PDCOBJS) : $(PDCURSES_WIN_H) $(DEMOOBJS) : $(PDCURSES_CURSES_H) $(DEMOS) : $(LIBCURSES) panel.obj : $(PANEL_HEADER) +terminfo.obj : $(TERM_HEADER) !ifndef DLL $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)