summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoachim Wilke <vdr@joachim-wilke.de>2010-03-27 18:24:27 +0100
committerJoachim Wilke <vdr@joachim-wilke.de>2010-03-27 18:24:27 +0100
commitc3c2cbc91f8653c897c872562244511ecff7c857 (patch)
tree5082f9b279718f13a6efd723e46ef16355537186
parentfae59a873397874d4d073f58d7db5e62eb581755 (diff)
downloadvdr-plugin-lcdproc-c3c2cbc91f8653c897c872562244511ecff7c857.tar.gz
vdr-plugin-lcdproc-c3c2cbc91f8653c897c872562244511ecff7c857.tar.bz2
- adapted Makefile for VDR >= 1.7.13
-rw-r--r--HISTORY2
-rw-r--r--Makefile9
2 files changed, 10 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 433ac57..8db68cf 100644
--- a/HISTORY
+++ b/HISTORY
@@ -93,5 +93,7 @@ Head:
- adapted to changes in VDR 1.7.11 regarding character set conversion.
- implemented cStatus::SetAudioChannel and SetAudioTrack to display audio track
information on lcd.
+- adapted Makefile for VDR >= 1.7.13
+
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 58f65e7..f671eb0 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,14 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
### The C++ compiler and options:
CXX ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual
+
+### Make sure that necessary options are included:
+ifeq ($(strip $(wildcard $(VDRDIR)/Make.global)),)
+ CXXFLAGS += -fPIC
+else
+ include $(VDRDIR)/Make.global
+endif
### The directory environment: