aboutsummaryrefslogtreecommitdiffstats
path: root/common.mak
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2009-07-12 15:50:25 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2009-07-12 15:50:25 +0000
commit04a803bef44e1929d3556c74c68e66b5124d7a3a (patch)
treee923a3a29997ad35a713c6044d5f90ff83194d8e /common.mak
parent0115927eaeec157314bcc8e10a61c47e153adf5c (diff)
downloadffmpeg-04a803bef44e1929d3556c74c68e66b5124d7a3a.tar.gz
Append the user CPPFLAGS value to the CPPFLAGS used for compilation,
rather than prepend it. This way there is the guarantee that the included headers are those in the FFmpeg sources, rather than pre-installed headers referenced by the user CPPFLAGS. Originally committed as revision 19416 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'common.mak')
-rw-r--r--common.mak2
1 files changed, 1 insertions, 1 deletions
diff --git a/common.mak b/common.mak
index 02c730338c..9cc735786f 100644
--- a/common.mak
+++ b/common.mak
@@ -18,7 +18,7 @@ endif
ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
-CPPFLAGS += -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH)
+CPPFLAGS := -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH) $(CPPFLAGS)
%.o: %.c
$(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c $(CC_O) $<