mirror of
https://github.com/mpv-player/mpv
synced 2025-03-05 05:37:37 +00:00
Move setting CXXFLAGS to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22731 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
7bb75adb60
commit
132dd09be9
5
configure
vendored
5
configure
vendored
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user