From a68b32da928b683cf80110becea4ef6491841d07 Mon Sep 17 00:00:00 2001 From: Chris Tallon Date: Wed, 14 Jun 2006 22:24:59 +0000 Subject: [PATCH] Fix for compiling with VDR 1.2.6, fix for compiling on 64bit systems --- Makefile | 2 +- libdvbmpeg/Makefile | 12 ++++++------ mvpclient.c | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 5055960..23cc9c1 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri ### The C++ compiler and options: CXX ?= g++ -CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -Werror +CXXFLAGS ?= -O2 -fPIC -Wall -Woverloaded-virtual -Werror ### The directory environment: diff --git a/libdvbmpeg/Makefile b/libdvbmpeg/Makefile index a56cb6b..ce53c5d 100644 --- a/libdvbmpeg/Makefile +++ b/libdvbmpeg/Makefile @@ -1,10 +1,10 @@ INCS = -I. -CFLAGS = -g -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +CFLAGS = -g -fPIC -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE MFLAG = -M OBJS = ctools.o ringbuffy.o remux.o transform.o cpptools.o SRC = $(wildcard *.c) CPPSRC = $(wildcard *.cpp) -CSRC = $(wildcard *.cc) +CSRC = $(wildcard *.cc) DESTDIR = /usr/local @@ -14,18 +14,18 @@ clean: - rm -f *.o *~ *.a .depend libdvbmpegtools.a: $(OBJS) - ar -rcs libdvbmpegtools.a $(OBJS) + ar -rcs libdvbmpegtools.a $(OBJS) -%.o: %.cc +%.o: %.cc $(CXX) -c $(CFLAGS) $(INCS) $(DEFINES) $< %.o: %.cpp $(CXX) -c $(CFLAGS) $(INCS) $(DEFINES) $< -%.o: %.c +%.o: %.c $(CC) -c $(CFLAGS) $(INCS) $(DEFINES) $< -.depend: +.depend: $(CXX) $(DEFINES) $(MFLAG) $(SRC) $(CSRC) $(CPPSRC) $(INCS)> .depend diff --git a/mvpclient.c b/mvpclient.c index 7e49785..256a6a5 100644 --- a/mvpclient.c +++ b/mvpclient.c @@ -498,9 +498,10 @@ int MVPClient::processMoveRecording(UCHAR* data, int length) if (renameret == 0) { +#if VDRVERSNUM > 10311 // Tell VDR ::Recordings.Update(); - +#endif // Success. Send a different packet from just a ulong int totalLength = 4 + 4 + strlen(newDir) + 1; UCHAR* sendBuffer = new UCHAR[totalLength]; -- 2.39.2