Mercurial > mplayer.hg

changeset 22603:1765c6c02f21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add live555 include flags to CXXFLAGS only. patch by Carl Eugen Hoyos, cehoyos ag.or at
author diego
date Thu, 15 Mar 2007 18:07:12 +0000
parents 195bebf09595
children ecd75dfafd40
files configure libmpdemux/Makefile
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Thu Mar 15 18:00:51 2007 +0000
+++ b/configure	Thu Mar 15 18:07:12 2007 +0000
@@ -6089,7 +6089,7 @@
                  $_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 @@
 LDCONFIG = $_ldconfig
 INSTALL = $_install
 EXTRA_INC = $_inc_extra
+EXTRAXX_INC = $_inc_extraxx
 OPTFLAGS = $CFLAGS \$(EXTRA_INC)
 INSTALLSTRIP = $_install_strip
 CHARSET = $_charset
--- a/libmpdemux/Makefile	Thu Mar 15 18:00:51 2007 +0000
+++ b/libmpdemux/Makefile	Thu Mar 15 18:07:12 2007 +0000
@@ -71,6 +71,6 @@
 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