summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2020-06-27 09:13:04 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2020-06-27 09:13:04 +0200
commit488a13543e91aac8290c87feaf2268febd7f9143 (patch)
tree61978662b85d36fd61dc3e85cbbdba0903acf52c
parent3cc0abf6eac449a0eb29c18545dfa2f6c33b5e21 (diff)
downloadvdr-488a13543e91aac8290c87feaf2268febd7f9143.tar.gz
vdr-488a13543e91aac8290c87feaf2268febd7f9143.tar.bz2
Now adding CPPFLAGS to CXXFLAGS to allow extra preprocessor flags to be given when doing make
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY4
-rw-r--r--Makefile3
3 files changed, 7 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 501482ee..3ebeb1c7 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2496,6 +2496,8 @@ Tobias Grimm <tobias.grimm@e-tobi.net>
for adding optional verbose output to the libsi Makefile
for making the call to pkg_config configurable via the PKG_CONFIG macro
for fixing a typo in svdrp.c
+ for suggesting to add CPPFLAGS to CXXFLAGS to allow extra preprocessor flags to be
+ given when doing make
Helge Lenz <h.lenz@gmx.de>
for reporting a bug in setting the 'Delta' parameter when calling the shutdown
diff --git a/HISTORY b/HISTORY
index 14892ab3..a298f08d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9453,7 +9453,7 @@ Video Disk Recorder Revision History
The version numbers (both VDRVERSNUM and APIVERSNUM) have been bumped to 2.4.2, so
that plugins can detect the presence of the new cControl::Control().
-2020-06-25: Version 2.4.3
+2020-06-27: Version 2.4.3
- Added a missing '-D' to the 'plugins' target of the Makefile (thanks to Johann
Friedrichs).
@@ -9488,3 +9488,5 @@ Video Disk Recorder Revision History
- Added a comment about the semantics of cTimeMs::Set().
- Adjusted device selection in GetDeviceForTransponder() to that in GetDevice() (thanks
to Helmut Binder).
+- Now adding CPPFLAGS to CXXFLAGS to allow extra preprocessor flags to be given when
+ doing make (suggested by Tobisa Grimm).
diff --git a/Makefile b/Makefile
index 93d061a8..25d4a9ca 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
-# $Id: Makefile 4.9 2020/06/22 15:08:46 kls Exp $
+# $Id: Makefile 4.10 2020/06/27 09:13:04 kls Exp $
.DELETE_ON_ERROR:
@@ -17,6 +17,7 @@ CFLAGS ?= -g -O3 -Wall
CXX ?= g++
CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
+CXXFLAGS += $(CPPFLAGS)
CDEFINES = -D_GNU_SOURCE
CDEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE