Commit 15b128dd authored by Martin Storsjo's avatar Martin Storsjo

Explicitly force building in C++98 mode

GCC 6 defaults to C++14 (or more precisely, gnu++14) instead of C++98
(or gnu++98).

The fdk-aac source doesn't support being built in this mode at the
moment, since it relies on narrowing conversion from unsigned 32 bit
integers to FIXP_DBL (which is a signed data type of the same size).

The same approach is used upstream in Android as well, since
d52f3747.

This fixes buliding with GCC 6.
parent 8fe6faf2
...@@ -12,7 +12,7 @@ AM_CPPFLAGS = \ ...@@ -12,7 +12,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libFDK/include \ -I$(top_srcdir)/libFDK/include \
-I$(top_srcdir)/libPCMutils/include -I$(top_srcdir)/libPCMutils/include
AM_CXXFLAGS = -fno-exceptions -fno-rtti AM_CXXFLAGS = -fno-exceptions -fno-rtti -std=c++98
libfdk_aac_la_LINK = $(LINK) $(libfdk_aac_la_LDFLAGS) libfdk_aac_la_LINK = $(LINK) $(libfdk_aac_la_LDFLAGS)
# Mention a dummy pure C file to trigger generation of the $(LINK) variable # Mention a dummy pure C file to trigger generation of the $(LINK) variable
nodist_EXTRA_libfdk_aac_la_SOURCES = dummy.c nodist_EXTRA_libfdk_aac_la_SOURCES = dummy.c
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment