diff options
| author |  diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-18 21:58:28 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-18 21:58:28 +0000 |
| commit | 132dd09be9dfc19c7dfaf9cfd391eaf7cf07f6ca (patch) | |
| tree | d1f4b3c947a006cd7ed2a45846b72f29038c68d5 | |
| parent | 7bb75adb600badab63746378f27142cb93c6a2bd (diff) | |
Move setting CXXFLAGS to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22731 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | libmpdemux/Makefile | 2 |
2 files changed, 4 insertions, 3 deletions
@@ -7409,6 +7409,8 @@ if test "$_largefiles" = yes || freebsd ; then 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 @@ RANLIB = $_ranlib 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 diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index b973c76abf..fc6eeb2290 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -69,6 +69,4 @@ 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 $(EXTRAXX_INC) - include ../mpcommon.mak |