Add live555 include flags to CXXFLAGS only.
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Thu, 15 Mar 2007 18:07:12 +0000 (18:07 +0000)
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Thu, 15 Mar 2007 18:07:12 +0000 (18:07 +0000)
patch by Carl Eugen Hoyos, cehoyos ag.or at

git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@22621 b3059339-0415-0410-9bf9-f77b7e298cf2

configure
libmpdemux/Makefile

index 8139091..55acff3 100755 (executable)
--- a/configure
+++ b/configure
@@ -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
index eb571fb..c3ec32c 100644 (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