Add live555 include flags to CXXFLAGS only.

patch by Carl Eugen Hoyos, cehoyos ag.or at


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22621 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2007-03-15 18:07:12 +00:00
parent 08928d50df
commit 8868c13dc7
2 changed files with 3 additions and 2 deletions

3
configure vendored
View File

@ -6089,7 +6089,7 @@ EOF
$_livelibdir/UsageEnvironment/libUsageEnvironment.a \
$_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
$_ld_extra -lstdc++" \
_inc_extra="$_inc_extra -I$_livelibdir/liveMedia/include \
_inc_extraxx="-I$_livelibdir/liveMedia/include \
-I$_livelibdir/UsageEnvironment/include \
-I$_livelibdir/BasicUsageEnvironment/include \
-I$_livelibdir/groupsock/include" && \
@ -7466,6 +7466,7 @@ RANLIB = $_ranlib
LDCONFIG = $_ldconfig
INSTALL = $_install
EXTRA_INC = $_inc_extra
EXTRAXX_INC = $_inc_extraxx
OPTFLAGS = $CFLAGS \$(EXTRA_INC)
INSTALLSTRIP = $_install_strip
CHARSET = $_charset

View File

@ -71,6 +71,6 @@ CFLAGS-$(CONFIG_LIBAVUTIL) += -I../libavutil
CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec
CFLAGS-$(CONFIG_LIBAVFORMAT) += -I../libavformat
CXXFLAGS = $(subst -Wdeclaration-after-statement,,$(CFLAGS)) -D__STDC_LIMIT_MACROS
CXXFLAGS = $(subst -Wdeclaration-after-statement,,$(CFLAGS)) -D__STDC_LIMIT_MACROS $(EXTRAXX_INC)
include ../mpcommon.mak