diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-15 18:07:12 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-15 18:07:12 +0000 |
commit | 8868c13dc7023cb114a841ae7c2a7d5dd0ad942b (patch) | |
tree | ed27e5085fabed32228361e8840a4bbfd0a09270 | |
parent | 08928d50dfbc133c62bf286893394482c0c161a5 (diff) | |
download | mpv-8868c13dc7023cb114a841ae7c2a7d5dd0ad942b.tar.bz2 mpv-8868c13dc7023cb114a841ae7c2a7d5dd0ad942b.tar.xz |
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
-rwxr-xr-x | configure | 3 | ||||
-rw-r--r-- | libmpdemux/Makefile | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -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 diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index eb571fbb85..c3ec32c060 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -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 |