From bff98f67a30c5e628c4b1205ca4f0d67f3e77f2a Mon Sep 17 00:00:00 2001 From: rswindell <> Date: Tue, 30 Apr 2002 08:03:02 +0000 Subject: [PATCH] Defined USE_CURSES (and made it the default). --- src/sbbs3/scfg/GNUmakefile | 14 ++++++++++++-- src/sbbs3/scfg/scfg.c | 6 +++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/sbbs3/scfg/GNUmakefile b/src/sbbs3/scfg/GNUmakefile index f5a3ac5ce3..4c02f8fefb 100644 --- a/src/sbbs3/scfg/GNUmakefile +++ b/src/sbbs3/scfg/GNUmakefile @@ -15,7 +15,8 @@ # Macros DEBUG = 1 # Comment out for release (non-debug) version -USE_DIALOG = 1 # Comment out for stdio (uifcx) version +#USE_DIALOG = 1 # Dialog vesrion of UIFC +USE_CURSES = 1 # Curses version of UIFC CC = gcc SLASH = / OFILE = o @@ -46,6 +47,11 @@ LFLAGS := $(LFLAGS) -L../../libdialog -ldialog -lcurses CFLAGS := $(CFLAGS) -I../../libdialog -DUSE_DIALOG endif +ifdef USE_CURSES +LFLAGS := $(LFLAGS) -lcurses +CFLAGS := $(CFLAGS) -DUSE_CURSES +endif + # Math library needed LFLAGS := $(LFLAGS) -lm @@ -61,10 +67,14 @@ include targets.mk # defines all targets include objects.mk # defines $(OBJS) include headers.mk # defines $(HEADERS) -ifdef USE_DIALOG # moved here from objects.mak +ifdef USE_DIALOG OBJS := $(OBJS) $(ODIR)$(SLASH)uifcd.$(OFILE) endif +ifdef USE_CURSES +OBJS := $(OBJS) $(ODIR)$(SLASH)uifcc.$(OFILE) +endif + vpath %.c .. vpath %.c $(UIFC) vpath %.c $(XPDEV) diff --git a/src/sbbs3/scfg/scfg.c b/src/sbbs3/scfg/scfg.c index e2a175c4a4..e2c9a682ac 100644 --- a/src/sbbs3/scfg/scfg.c +++ b/src/sbbs3/scfg/scfg.c @@ -159,7 +159,11 @@ backslashcolon(cfg.ctrl_dir); uifc.size=sizeof(uifc); #if defined(USE_DIALOG) if(!door_mode) - i=uifcinid(&uifc); /* libdialog */ + i=uifcinid(&uifc); /* dialog */ +else +#elif defined(USE_CURSES) +if(!door_mode) + i=uifcinic(&uifc); /* curses */ else #elif !defined(__unix__) if(!door_mode) -- GitLab