No longer requiring 'libncurses' if compiling without DEBUG_OSD=1 and REMOTE=KBD

This commit is contained in:
Klaus Schmidinger 2002-01-13 16:57:27 +01:00
parent 49b2813699
commit e1ab9c1dac
3 changed files with 13 additions and 2 deletions

View File

@ -171,3 +171,7 @@ Thilo Wunderlich <tw@ubcom.net>
Stephan Schreiber <stephan@sschreiber.de>
for his support in keeping the Premiere World channels up to date in 'channels.conf.cable'
Lauri Pesonen <lauri.pesonen@firsthop.com>
for avoiding linking in 'libncurses' if compiling without DEBUG_OSD=1 and
REMOTE=KBD

View File

@ -894,3 +894,5 @@ Video Disk Recorder Revision History
broadcast the correct timestamps for EPG events between 0:00 and 6:00!
- Fixed failing watchdog timer if program hangs in OSD activities (thanks to
Carsten Koch).
- No longer requiring 'libncurses' if compiling without DEBUG_OSD=1 and
REMOTE=KBD (thanks to Lauri Pesonen).

View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
# $Id: Makefile 1.28 2001/10/07 15:14:50 kls Exp $
# $Id: Makefile 1.29 2002/01/13 16:57:27 kls Exp $
.DELETE_ON_ERROR:
@ -37,12 +37,17 @@ ifndef REMOTE
REMOTE = KBD
endif
ifeq ($(REMOTE), KBD)
NCURSESLIB = -lncurses
endif
DEFINES += -DREMOTE_$(REMOTE)
DEFINES += -D_GNU_SOURCE
ifdef DEBUG_OSD
DEFINES += -DDEBUG_OSD
NCURSESLIB = -lncurses
endif
ifdef VFAT
@ -71,7 +76,7 @@ include $(DEPFILE)
# The main program:
vdr: $(OBJS) $(AC3LIB) $(DTVLIB)
g++ -g -O2 $(OBJS) -lncurses -ljpeg -lpthread $(LIBDIRS) $(DVDLIB) $(AC3LIB) $(DTVLIB) -o vdr
g++ -g -O2 $(OBJS) $(NCURSESLIB) -ljpeg -lpthread $(LIBDIRS) $(DVDLIB) $(AC3LIB) $(DTVLIB) -o vdr
# The font files: