mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
Version 1.1.6
- Re-visited the race condition fix in the cDvbPlayer (thanks again to Andreas Schultz). - Changed the VFAT handling to allow users who normally use it but have forgotten to set it when compiling a new version of VDR to at least see their recordings made with VFAT enabled (thanks to Christian Rienecker). - Added some missing teletext PIDs (thanks to Joerg Riechardt). - Fixed PID handling for cReceiver. - Added a missing #include to ringbuffer.c (thanks to Martin Hammerschmid). - Now using CC, CFLAGS, CXX and CXXFLAGS in Makefile. - Changed the cDevice class to allow plugins to implement their own devices (see PLUGINS.html for details).
This commit is contained in:
18
Makefile
18
Makefile
@@ -4,10 +4,16 @@
|
||||
# See the main source file 'vdr.c' for copyright information and
|
||||
# how to reach the author.
|
||||
#
|
||||
# $Id: Makefile 1.42 2002/06/22 10:21:56 kls Exp $
|
||||
# $Id: Makefile 1.44 2002/07/28 15:20:47 kls Exp $
|
||||
|
||||
.DELETE_ON_ERROR:
|
||||
|
||||
CC = gcc
|
||||
CFLAGS = -O2
|
||||
|
||||
CXX = g++
|
||||
CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
|
||||
|
||||
DVBDIR = ../DVB
|
||||
DTVDIR = ./libdtv
|
||||
MANDIR = /usr/local/man
|
||||
@@ -21,7 +27,7 @@ INCLUDES = -I$(DVBDIR)/ost/include
|
||||
|
||||
DTVLIB = $(DTVDIR)/libdtv.a
|
||||
|
||||
OBJS = audio.o config.o cutter.o device.o dvbplayer.o dvbosd.o eit.o eitscan.o font.o i18n.o\
|
||||
OBJS = audio.o config.o cutter.o device.o dvbdevice.o dvbosd.o dvbplayer.o eit.o eitscan.o font.o i18n.o\
|
||||
interface.o menu.o menuitems.o osdbase.o osd.o player.o plugin.o receiver.o\
|
||||
recorder.o recording.o remote.o remux.o ringbuffer.o status.o svdrp.o thread.o\
|
||||
tools.o transfer.o vdr.o videodir.o
|
||||
@@ -58,11 +64,11 @@ font: genfontfile fontfix.c fontosd.c
|
||||
# Implicit rules:
|
||||
|
||||
%.o: %.c
|
||||
g++ -g -O2 -Wall -Woverloaded-virtual -c $(DEFINES) $(INCLUDES) $<
|
||||
$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
|
||||
|
||||
# Dependencies:
|
||||
|
||||
MAKEDEP = g++ -MM -MG
|
||||
MAKEDEP = $(CXX) -MM -MG
|
||||
DEPFILE = .dependencies
|
||||
$(DEPFILE): Makefile
|
||||
@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
|
||||
@@ -72,7 +78,7 @@ $(DEPFILE): Makefile
|
||||
# The main program:
|
||||
|
||||
vdr: $(OBJS) $(DTVLIB)
|
||||
g++ -g -O2 -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(DTVLIB) -o vdr
|
||||
$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(DTVLIB) -o vdr
|
||||
|
||||
# The font files:
|
||||
|
||||
@@ -84,7 +90,7 @@ fontosd.c:
|
||||
# The font file generator:
|
||||
|
||||
genfontfile: genfontfile.c
|
||||
gcc -o $@ -O2 -L/usr/X11R6/lib $< -lX11
|
||||
$(CC) $(CFLAGS) -o $@ -L/usr/X11R6/lib $< -lX11
|
||||
|
||||
# The libdtv library:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user