Mercurial > mplayer.hg

changeset 22713:88b877974c8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move setting CXXFLAGS to configure.
author diego
date Sun, 18 Mar 2007 21:58:28 +0000
parents c7eee1ecbe8c
children 97ad9cecc6d9
files configure libmpdemux/Makefile
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sun Mar 18 21:39:52 2007 +0000
+++ b/configure	Sun Mar 18 21:58:28 2007 +0000
@@ -7409,6 +7409,8 @@
   fi
 fi
 
+CXXFLAGS="-I.. $CFLAGS -D__STDC_LIMIT_MACROS"
+
 if cc_check -Wdeclaration-after-statement ; then
   CFLAGS="-Wdeclaration-after-statement $CFLAGS"
 fi
@@ -7478,8 +7480,9 @@
 LDCONFIG = $_ldconfig
 INSTALL = $_install
 EXTRA_INC = $_inc_extra
-EXTRAXX_INC = $_inc_extraxx
+EXTRAXX_INC = $_inc_extra $_inc_extraxx
 OPTFLAGS = $CFLAGS \$(EXTRA_INC)
+CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC)
 INSTALLSTRIP = $_install_strip
 CHARSET = $_charset
 HELP_FILE = $_mp_help
--- a/libmpdemux/Makefile	Sun Mar 18 21:39:52 2007 +0000
+++ b/libmpdemux/Makefile	Sun Mar 18 21:58:28 2007 +0000
@@ -69,6 +69,4 @@
 CFLAGS-$(CONFIG_LIBAVCODEC)     += -I../libavcodec
 CFLAGS-$(CONFIG_LIBAVFORMAT)    += -I../libavformat
 
-CXXFLAGS  = $(subst -Wdeclaration-after-statement,,$(CFLAGS)) -D__STDC_LIMIT_MACROS $(EXTRAXX_INC)
-
 include ../mpcommon.mak