From 22c4d82f8cd370d7af7ee805de4b4adc3e95ce1e Mon Sep 17 00:00:00 2001 From: Bill-Gray Date: Thu, 16 Jan 2020 11:44:14 -0500 Subject: [PATCH] Followed wcbrine's lead: removed terminfo.c and term.h, moved mvcur() to move.c See docs/HISTORY.md for details on why this was done. --- dos/Makefile.dmc | 13 +-- libobjs.mif | 3 +- makedist.mif | 1 - os2/Makefile | 1 - os2/Makefile.bcc | 2 +- os2/iccos2.lrf | 1 - os2/iccos2.mak | 3 - pdcurses/move.c | 28 +++++- pdcurses/terminfo.c | 217 -------------------------------------------- sdl1/Makefile | 1 - sdl1/Makefile.mng | 1 - term.h | 48 ---------- vt/Makefile | 1 - vt/Makefile.dmc | 7 +- vt/Makefile.vc | 1 - watcom.mif | 2 +- wincon/Makefile.dmc | 7 +- wincon/Makefile.mng | 1 - wingui/Makefile.dmc | 7 +- wingui/Makefile.lcc | 7 +- wingui/Makefile.mng | 1 - wingui/Makefile.vc | 1 - 22 files changed, 35 insertions(+), 319 deletions(-) delete mode 100644 pdcurses/terminfo.c delete mode 100644 term.h diff --git a/dos/Makefile.dmc b/dos/Makefile.dmc index 8e7c92fb..428c1a72 100644 --- a/dos/Makefile.dmc +++ b/dos/Makefile.dmc @@ -12,7 +12,6 @@ PDCURSES_CURSPRIV_H = $(PDCURSES_SRCDIR)\curspriv.h PDCURSES_HEADERS = $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H) PANEL_HEADER = $(PDCURSES_SRCDIR)\panel.h -TERM_HEADER = $(PDCURSES_SRCDIR)\term.h srcdir = $(PDCURSES_SRCDIR)\pdcurses osdir = $(PDCURSES_SRCDIR)\dos @@ -35,7 +34,7 @@ LIBCURSES = pdcurses.lib BUILD = $(CC) $(CFLAGS) $(CPPFLAGS) -DEMOS = testcurs.exe ozdemo.exe newtest.exe xmas.exe \ +DEMOS = testcurs.exe newdemo.exe newtest.exe xmas.exe \ tuidemo.exe firework.exe ptest.exe rain.exe worm.exe all: $(LIBCURSES) $(DEMOS) @@ -52,19 +51,18 @@ border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \ getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \ insch.obj insstr.obj instr.obj kernel.obj keyname.obj mouse.obj move.obj \ outopts.obj overlay.obj pad.obj panel.obj printw.obj refresh.obj \ -scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj terminfo.obj \ +scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj \ touch.obj util.obj window.obj debug.obj PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \ pdcsetsc.obj pdcutil.obj -DEMOOBJS = testcurs.obj ozdemo.obj newtest.obj xmas.obj tuidemo.obj \ +DEMOOBJS = testcurs.obj newdemo.obj newtest.obj xmas.obj tuidemo.obj \ tui.obj firework.obj ptest.obj rain.obj worm.obj $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) $(PDCOBJS) : $(PDCURSES_DOS_H) panel.obj ptest.obj: $(PANEL_HEADER) -terminfo.obj: $(TERM_HEADER) $(DEMOOBJS) : $(PDCURSES_CURSES_H) $(DEMOS) : $(LIBCURSES) @@ -184,9 +182,6 @@ slk.obj: $(srcdir)\slk.c termattr.obj: $(srcdir)\termattr.c $(SRCBUILD) -terminfo.obj: $(srcdir)\terminfo.c - $(SRCBUILD) - touch.obj: $(srcdir)\touch.c $(SRCBUILD) @@ -223,7 +218,7 @@ pdcutil.obj: $(osdir)\pdcutil.c firework.exe: $(demodir)\firework.c $(DEMOBUILD) -ozdemo.exe: $(demodir)\ozdemo.c +newdemo.exe: $(demodir)\newdemo.c $(DEMOBUILD) newtest.exe: $(demodir)\newtest.c diff --git a/libobjs.mif b/libobjs.mif index 8fb7cbe9..ad5cdace 100644 --- a/libobjs.mif +++ b/libobjs.mif @@ -5,7 +5,6 @@ PDCURSES_CURSES_H = $(PDCURSES_SRCDIR)/curses.h PDCURSES_CURSPRIV_H = $(PDCURSES_SRCDIR)/curspriv.h PDCURSES_HEADERS = $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H) PANEL_HEADER = $(PDCURSES_SRCDIR)/panel.h -TERM_HEADER = $(PDCURSES_SRCDIR)/term.h srcdir = $(PDCURSES_SRCDIR)/pdcurses demodir = $(PDCURSES_SRCDIR)/demos @@ -16,7 +15,7 @@ getch.$(O) getstr.$(O) getyx.$(O) inch.$(O) inchstr.$(O) \ initscr.$(O) inopts.$(O) insch.$(O) insstr.$(O) instr.$(O) kernel.$(O) \ keyname.$(O) mouse.$(O) move.$(O) outopts.$(O) overlay.$(O) pad.$(O) \ panel.$(O) printw.$(O) refresh.$(O) scanw.$(O) scr_dump.$(O) scroll.$(O) \ -slk.$(O) termattr.$(O) terminfo.$(O) touch.$(O) util.$(O) window.$(O) \ +slk.$(O) termattr.$(O) touch.$(O) util.$(O) window.$(O) \ debug.$(O) PDCOBJS = pdcclip.$(O) pdcdisp.$(O) pdcgetsc.$(O) pdckbd.$(O) pdcscrn.$(O) \ diff --git a/makedist.mif b/makedist.mif index 318148b0..9cb116a1 100644 --- a/makedist.mif +++ b/makedist.mif @@ -12,7 +12,6 @@ dist: $(PDCLIBS) echo $(PDCURSES_SRCDIR)\HISTORY.md >> flist echo $(PDCURSES_SRCDIR)\curses.h >> flist echo $(PDCURSES_SRCDIR)\panel.h >> flist - echo $(PDCURSES_SRCDIR)\term.h >> flist echo $(LIBCURSES) >> flist echo file_id.diz >> flist zip -9jX $(ARCNAME) -@ = LINES || newcol < 0 || newcol >= COLS) + return ERR; + + PDC_gotoyx(newrow, newcol); + SP->cursrow = newrow; + SP->curscol = newcol; + + return OK; +} + int wmove(WINDOW *win, int y, int x) { PDC_LOG(("wmove() - called: y=%d x=%d\n", y, x)); diff --git a/pdcurses/terminfo.c b/pdcurses/terminfo.c deleted file mode 100644 index befb3d3b..00000000 --- a/pdcurses/terminfo.c +++ /dev/null @@ -1,217 +0,0 @@ -/* PDCurses */ - -#include - -/*man-start************************************************************** - -terminfo --------- - -### Synopsis - - int mvcur(int oldrow, int oldcol, int newrow, int newcol); - int vidattr(chtype attr); - int vid_attr(attr_t attr, short color_pair, void *opt); - int vidputs(chtype attr, int (*putfunc)(int)); - int vid_puts(attr_t attr, short color_pair, void *opt, - int (*putfunc)(int)); - - int del_curterm(TERMINAL *); - int putp(const char *); - int restartterm(const char *, int, int *); - TERMINAL *set_curterm(TERMINAL *); - int setterm(const char *term); - int setupterm(const char *, int, int *); - int tgetent(char *, const char *); - int tgetflag(const char *); - int tgetnum(const char *); - char *tgetstr(const char *, char **); - char *tgoto(const char *, int, int); - int tigetflag(const char *); - int tigetnum(const char *); - char *tigetstr(const char *); - char *tparm(const char *,long, long, long, long, long, long, - long, long, long); - int tputs(const char *, int, int (*)(int)); - -### Description - - mvcur() lets you move the physical cursor without updating any - window cursor positions. It returns OK or ERR. - - The rest of these functions are currently implemented as stubs, - returning the appropriate errors and doing nothing else. - -### Portability - X/Open BSD SYS V - mvcur Y Y Y - -**man-end****************************************************************/ - -#include - -TERMINAL *cur_term = NULL; - -int mvcur(int oldrow, int oldcol, int newrow, int newcol) -{ - PDC_LOG(("mvcur() - called: oldrow %d oldcol %d newrow %d newcol %d\n", - oldrow, oldcol, newrow, newcol)); - - if ((newrow >= LINES) || (newcol >= COLS) || (newrow < 0) || (newcol < 0)) - return ERR; - - PDC_gotoyx(newrow, newcol); - SP->cursrow = newrow; - SP->curscol = newcol; - - return OK; -} - -int vidattr(chtype attr) -{ - PDC_LOG(("vidattr() - called: attr %d\n", attr)); - - return ERR; -} - -int vid_attr(attr_t attr, short color_pair, void *opt) -{ - PDC_LOG(("vid_attr() - called\n")); - - return ERR; -} - -int vidputs(chtype attr, int (*putfunc)(int)) -{ - PDC_LOG(("vidputs() - called: attr %d\n", attr)); - - return ERR; -} - -int vid_puts(attr_t attr, short color_pair, void *opt, int (*putfunc)(int)) -{ - PDC_LOG(("vid_puts() - called\n")); - - return ERR; -} - -int del_curterm(TERMINAL *oterm) -{ - PDC_LOG(("del_curterm() - called\n")); - - return ERR; -} - -int putp(const char *str) -{ - PDC_LOG(("putp() - called: str %s\n", str)); - - return ERR; -} - -int restartterm(const char *term, int filedes, int *errret) -{ - PDC_LOG(("restartterm() - called\n")); - - if (errret) - *errret = -1; - - return ERR; -} - -TERMINAL *set_curterm(TERMINAL *nterm) -{ - PDC_LOG(("set_curterm() - called\n")); - - return (TERMINAL *)NULL; -} - -int setterm(const char *term) -{ - PDC_LOG(("setterm() - called\n")); - - return ERR; -} - -int setupterm(const char *term, int filedes, int *errret) -{ - PDC_LOG(("setupterm() - called\n")); - - if (errret) - *errret = -1; - else - fprintf(stderr, "There is no terminfo database\n"); - - return ERR; -} - -int tgetent(char *bp, const char *name) -{ - PDC_LOG(("tgetent() - called: name %s\n", name)); - - return ERR; -} - -int tgetflag(const char *id) -{ - PDC_LOG(("tgetflag() - called: id %s\n", id)); - - return ERR; -} - -int tgetnum(const char *id) -{ - PDC_LOG(("tgetnum() - called: id %s\n", id)); - - return ERR; -} - -char *tgetstr(const char *id, char **area) -{ - PDC_LOG(("tgetstr() - called: id %s\n", id)); - - return (char *)NULL; -} - -char *tgoto(const char *cap, int col, int row) -{ - PDC_LOG(("tgoto() - called\n")); - - return (char *)NULL; -} - -int tigetflag(const char *capname) -{ - PDC_LOG(("tigetflag() - called: capname %s\n", capname)); - - return -1; -} - -int tigetnum(const char *capname) -{ - PDC_LOG(("tigetnum() - called: capname %s\n", capname)); - - return -2; -} - -char *tigetstr(const char *capname) -{ - PDC_LOG(("tigetstr() - called: capname %s\n", capname)); - - return (char *)(-1); -} - -char *tparm(const char *cap, long p1, long p2, long p3, long p4, - long p5, long p6, long p7, long p8, long p9) -{ - PDC_LOG(("tparm() - called: cap %s\n", cap)); - - return (char *)NULL; -} - -int tputs(const char *str, int affcnt, int (*putfunc)(int)) -{ - PDC_LOG(("tputs() - called\n")); - - return ERR; -} diff --git a/sdl1/Makefile b/sdl1/Makefile index 66431e41..dbb77be4 100644 --- a/sdl1/Makefile +++ b/sdl1/Makefile @@ -83,7 +83,6 @@ $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) $(PDCOBJS) : $(PDCURSES_SDL_H) $(DEMOS) : $(PDCURSES_CURSES_H) $(LIBCURSES) tui.o tuidemo.o : $(PDCURSES_CURSES_H) -terminfo.o: $(TERM_HEADER) panel.o ptest: $(PANEL_HEADER) $(LIBOBJS) : %.o: $(srcdir)/%.c diff --git a/sdl1/Makefile.mng b/sdl1/Makefile.mng index 8bbdf676..87a36aef 100644 --- a/sdl1/Makefile.mng +++ b/sdl1/Makefile.mng @@ -84,7 +84,6 @@ $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) $(PDCOBJS) : $(PDCURSES_SDL_H) $(DEMOS) : $(PDCURSES_CURSES_H) $(LIBCURSES) tui.o tuidemo.o : $(PDCURSES_CURSES_H) -terminfo.o: $(TERM_HEADER) panel.o ptest.exe: $(PANEL_HEADER) $(LIBOBJS) : %.o: $(srcdir)/%.c diff --git a/term.h b/term.h deleted file mode 100644 index 0ba0b7a7..00000000 --- a/term.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Public Domain Curses */ - -/* PDCurses doesn't operate with terminfo, but we need these functions for - compatibility, to allow some things (notably, interface libraries for - other languages) to be compiled. Anyone who tries to actually _use_ - them will be disappointed, since they only return ERR. */ - -#ifndef __PDCURSES_TERM_H__ -#define __PDCURSES_TERM_H__ 1 - -#include - -#if defined(__cplusplus) || defined(__cplusplus__) || defined(__CPLUSPLUS) -extern "C" -{ -#endif - -typedef struct -{ - const char *_termname; -} TERMINAL; - -/* PDCEX is defined in curses.h */ -PDCEX TERMINAL *cur_term; - -int del_curterm(TERMINAL *); -int putp(const char *); -int restartterm(const char *, int, int *); -TERMINAL *set_curterm(TERMINAL *); -int setterm(const char *); -int setupterm(const char *, int, int *); -int tgetent(char *, const char *); -int tgetflag(const char *); -int tgetnum(const char *); -char *tgetstr(const char *, char **); -char *tgoto(const char *, int, int); -int tigetflag(const char *); -int tigetnum(const char *); -char *tigetstr(const char *); -char *tparm(const char *, long, long, long, long, long, - long, long, long, long); -int tputs(const char *, int, int (*)(int)); - -#if defined(__cplusplus) || defined(__cplusplus__) || defined(__CPLUSPLUS) -} -#endif - -#endif /* __PDCURSES_TERM_H__ */ diff --git a/vt/Makefile b/vt/Makefile index b5f0c42a..cc8cec4f 100644 --- a/vt/Makefile +++ b/vt/Makefile @@ -92,7 +92,6 @@ $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) $(DEMOS) : $(PDCURSES_CURSES_H) $(LIBCURSES) tui.o tuidemo.o : $(PDCURSES_CURSES_H) -terminfo.o: $(TERM_HEADER) panel.o ptest: $(PANEL_HEADER) $(LIBOBJS) : %.o: $(srcdir)/%.c diff --git a/vt/Makefile.dmc b/vt/Makefile.dmc index 48fd858d..3f9984c1 100644 --- a/vt/Makefile.dmc +++ b/vt/Makefile.dmc @@ -12,7 +12,6 @@ PDCURSES_CURSPRIV_H = $(PDCURSES_SRCDIR)\curspriv.h PDCURSES_HEADERS = $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H) PANEL_HEADER = $(PDCURSES_SRCDIR)\panel.h -TERM_HEADER = $(PDCURSES_SRCDIR)\term.h srcdir = $(PDCURSES_SRCDIR)\pdcurses osdir = $(PDCURSES_SRCDIR)\vt @@ -53,7 +52,7 @@ border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \ getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \ insch.obj insstr.obj instr.obj kernel.obj keyname.obj mouse.obj move.obj \ outopts.obj overlay.obj pad.obj panel.obj printw.obj refresh.obj \ -scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj terminfo.obj \ +scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj \ touch.obj util.obj window.obj debug.obj PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \ @@ -65,7 +64,6 @@ tui.obj firework.obj ptest.obj rain.obj worm.obj $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) $(PDCOBJS) : $(PDCURSES_VT_H) panel.obj ptest.obj: $(PANEL_HEADER) -terminfo.obj: $(TERM_HEADER) $(DEMOOBJS) : $(PDCURSES_CURSES_H) $(DEMOS) : $(LIBCURSES) @@ -185,9 +183,6 @@ slk.obj: $(srcdir)\slk.c termattr.obj: $(srcdir)\termattr.c $(SRCBUILD) -terminfo.obj: $(srcdir)\terminfo.c - $(SRCBUILD) - touch.obj: $(srcdir)\touch.c $(SRCBUILD) diff --git a/vt/Makefile.vc b/vt/Makefile.vc index ca8c338a..8f5cd300 100644 --- a/vt/Makefile.vc +++ b/vt/Makefile.vc @@ -102,7 +102,6 @@ $(PDCOBJS) : $(PDCURSES_WIN_H) $(DEMOOBJS) : $(PDCURSES_CURSES_H) $(DEMOS) : $(LIBCURSES) panel.obj : $(PANEL_HEADER) -terminfo.obj: $(TERM_HEADER) !ifndef DLL $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) diff --git a/watcom.mif b/watcom.mif index 40d130f6..a7f205c6 100644 --- a/watcom.mif +++ b/watcom.mif @@ -16,7 +16,7 @@ border.obj clear.obj color.obj delch.obj deleteln.obj & getch.obj getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj & insch.obj insstr.obj instr.obj kernel.obj keyname.obj mouse.obj move.obj & outopts.obj overlay.obj pad.obj panel.obj printw.obj refresh.obj & -scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj terminfo.obj & +scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj & touch.obj util.obj window.obj debug.obj PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj & diff --git a/wincon/Makefile.dmc b/wincon/Makefile.dmc index 93068405..06c9dcca 100644 --- a/wincon/Makefile.dmc +++ b/wincon/Makefile.dmc @@ -12,7 +12,6 @@ PDCURSES_CURSPRIV_H = $(PDCURSES_SRCDIR)\curspriv.h PDCURSES_HEADERS = $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H) PANEL_HEADER = $(PDCURSES_SRCDIR)\panel.h -TERM_HEADER = $(PDCURSES_SRCDIR)\term.h srcdir = $(PDCURSES_SRCDIR)\pdcurses osdir = $(PDCURSES_SRCDIR)\wincon @@ -50,7 +49,7 @@ border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \ getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \ insch.obj insstr.obj instr.obj kernel.obj keyname.obj mouse.obj move.obj \ outopts.obj overlay.obj pad.obj panel.obj printw.obj refresh.obj \ -scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj terminfo.obj \ +scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj \ touch.obj util.obj window.obj debug.obj PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \ @@ -62,7 +61,6 @@ firework.obj ptest.obj rain.obj worm.obj $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) $(PDCOBJS) : $(PDCURSES_WIN_H) panel.obj ptest.obj: $(PANEL_HEADER) -terminfo.obj: $(TERM_HEADER) $(DEMOOBJS) : $(PDCURSES_CURSES_H) $(DEMOS) : $(LIBCURSES) @@ -183,9 +181,6 @@ slk.obj: $(srcdir)\slk.c termattr.obj: $(srcdir)\termattr.c $(SRCBUILD) -terminfo.obj: $(srcdir)\terminfo.c - $(SRCBUILD) - touch.obj: $(srcdir)\touch.c $(SRCBUILD) diff --git a/wincon/Makefile.mng b/wincon/Makefile.mng index 2ac7430d..799a1bce 100644 --- a/wincon/Makefile.mng +++ b/wincon/Makefile.mng @@ -140,7 +140,6 @@ $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) $(PDCOBJS) : $(PDCURSES_WIN_H) $(DEMOS) : $(PDCURSES_CURSES_H) $(LIBCURSES) panel.o : $(PANEL_HEADER) -terminfo.o: $(TERM_HEADER) $(LIBOBJS) : %.o: $(srcdir)/%.c $(CC) -c $(CFLAGS) $< diff --git a/wingui/Makefile.dmc b/wingui/Makefile.dmc index cffa7cdd..79419be2 100644 --- a/wingui/Makefile.dmc +++ b/wingui/Makefile.dmc @@ -12,7 +12,6 @@ PDCURSES_CURSPRIV_H = $(PDCURSES_SRCDIR)\curspriv.h PDCURSES_HEADERS = $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H) PANEL_HEADER = $(PDCURSES_SRCDIR)\panel.h -TERM_HEADER = $(PDCURSES_SRCDIR)\term.h srcdir = $(PDCURSES_SRCDIR)\pdcurses osdir = $(PDCURSES_SRCDIR)\wingui @@ -51,7 +50,7 @@ border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \ getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \ insch.obj insstr.obj instr.obj kernel.obj keyname.obj mouse.obj move.obj \ outopts.obj overlay.obj pad.obj panel.obj printw.obj refresh.obj \ -scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj terminfo.obj \ +scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj \ touch.obj util.obj window.obj debug.obj PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \ @@ -65,7 +64,6 @@ LIBS = advapi32.lib gdi32.lib user32.lib shell32.lib comdlg32.lib $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) $(PDCOBJS) : $(PDCURSES_WIN_H) panel.obj ptest.obj: $(PANEL_HEADER) -terminfo.obj: $(TERM_HEADER) $(DEMOOBJS) : $(PDCURSES_CURSES_H) $(DEMOS) : $(LIBCURSES) @@ -186,9 +184,6 @@ slk.obj: $(srcdir)\slk.c termattr.obj: $(srcdir)\termattr.c $(SRCBUILD) -terminfo.obj: $(srcdir)\terminfo.c - $(SRCBUILD) - touch.obj: $(srcdir)\touch.c $(SRCBUILD) diff --git a/wingui/Makefile.lcc b/wingui/Makefile.lcc index ea101e1d..3169e5b0 100644 --- a/wingui/Makefile.lcc +++ b/wingui/Makefile.lcc @@ -12,7 +12,6 @@ PDCURSES_CURSPRIV_H = $(PDCURSES_SRCDIR)\curspriv.h PDCURSES_HEADERS = $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H) PANEL_HEADER = $(PDCURSES_SRCDIR)\panel.h -TERM_HEADER = $(PDCURSES_SRCDIR)\term.h srcdir = $(PDCURSES_SRCDIR)\pdcurses osdir = $(PDCURSES_SRCDIR)\wingui @@ -50,7 +49,7 @@ border.obj clear.obj color.obj delch.obj deleteln.obj getch.obj \ getstr.obj getyx.obj inch.obj inchstr.obj initscr.obj inopts.obj \ insch.obj insstr.obj instr.obj kernel.obj keyname.obj mouse.obj move.obj \ outopts.obj overlay.obj pad.obj panel.obj printw.obj refresh.obj \ -scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj terminfo.obj \ +scanw.obj scr_dump.obj scroll.obj slk.obj termattr.obj \ touch.obj util.obj window.obj debug.obj PDCOBJS = pdcclip.obj pdcdisp.obj pdcgetsc.obj pdckbd.obj pdcscrn.obj \ @@ -62,7 +61,6 @@ firework.obj ptest.obj rain.obj worm.obj $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) $(PDCOBJS) : $(PDCURSES_WIN_H) panel.obj ptest.obj: $(PANEL_HEADER) -terminfo.obj: $(TERM_HEADER) $(DEMOOBJS) : $(PDCURSES_CURSES_H) $(DEMOS) : $(LIBCURSES) @@ -182,9 +180,6 @@ slk.obj: $(srcdir)\slk.c termattr.obj: $(srcdir)\termattr.c $(SRCBUILD) -terminfo.obj: $(srcdir)\terminfo.c - $(SRCBUILD) - touch.obj: $(srcdir)\touch.c $(SRCBUILD) diff --git a/wingui/Makefile.mng b/wingui/Makefile.mng index 382fcad3..92dfc5ec 100644 --- a/wingui/Makefile.mng +++ b/wingui/Makefile.mng @@ -143,7 +143,6 @@ $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS) $(PDCOBJS) : $(PDCURSES_WIN_H) $(DEMOS) : $(PDCURSES_CURSES_H) $(LIBCURSES) panel.o : $(PANEL_HEADER) -terminfo.o: $(TERM_HEADER) $(LIBOBJS) : %.o: $(srcdir)/%.c $(CC) -c $(CFLAGS) $< diff --git a/wingui/Makefile.vc b/wingui/Makefile.vc index 18eebab3..e3badad6 100644 --- a/wingui/Makefile.vc +++ b/wingui/Makefile.vc @@ -102,7 +102,6 @@ $(PDCOBJS) : $(PDCURSES_WIN_H) $(DEMOOBJS) : $(PDCURSES_CURSES_H) $(DEMOS) : $(LIBCURSES) panel.obj : $(PANEL_HEADER) -terminfo.obj: $(TERM_HEADER) !ifndef DLL $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS)