aboutsummaryrefslogtreecommitdiffstats
path: root/common.mak
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-30 17:44:56 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-30 17:51:33 +0200
commit64f07754fe48b4c794ffbcd753803dae21dcc2c1 (patch)
tree0f27e14889579481ae6f13064e66bf72e563ce0f /common.mak
parent64a2c51f7b1c34872ce944be1a2a3a23679a41f0 (diff)
downloadffmpeg-64f07754fe48b4c794ffbcd753803dae21dcc2c1.tar.gz
buildsys: fix c++ compilation
Based on code by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 68909e63dd..eed8f08c6d 100644
--- a/common.mak
+++ b/common.mak
@@ -28,7 +28,7 @@ CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
CFLAGS += $(ECFLAGS)
CCFLAGS = $(CPPFLAGS) $(CFLAGS)
ASFLAGS := $(CPPFLAGS) $(ASFLAGS)
-CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
+CXXFLAGS += $(CPPFLAGS) $(CFLAGS)
YASMFLAGS += $(IFLAGS) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm
HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS)
LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS)