[vlc-commits] contrib: Force building mfx and projectM in C++98 mode

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Thu Dec 28 22:58:33 2017 +0200| [c2bca155fbff9bd6f8c00cf72c8bed31acd0fe6d] | committer: Jean-Baptiste Kempf

contrib: Force building mfx and projectM in C++98 mode

The latest trunk version of clang (upcoming clang 6.0) has changed
the default to C++14, just like GCC 6.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit f6b2aec16be86506da594d6597878c68cd57bc35)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c2bca155fbff9bd6f8c00cf72c8bed31acd0fe6d
---

 contrib/src/mfx/rules.mak      | 2 +-
 contrib/src/projectM/rules.mak | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/src/mfx/rules.mak b/contrib/src/mfx/rules.mak
index 13b14236c0..165ff8610a 100644
--- a/contrib/src/mfx/rules.mak
+++ b/contrib/src/mfx/rules.mak
@@ -23,6 +23,6 @@ mfx: mfx-$(MFX_GITHASH).tar.xz .sum-mfx
 	$(MOVE)
 
 .mfx: mfx
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CXXFLAGS="-std=c++98 -O2"
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/projectM/rules.mak b/contrib/src/projectM/rules.mak
index 25e8dc4068..a9e7b29911 100644
--- a/contrib/src/projectM/rules.mak
+++ b/contrib/src/projectM/rules.mak
@@ -35,6 +35,7 @@ DEPS_projectM = glew $(DEPS_glew)
 		-DUSE_FTGL:BOOL=OFF \
 		-DINCLUDE-PROJECTM-PULSEAUDIO:BOOL=OFF \
 		-DINCLUDE-PROJECTM-QT:BOOL=OFF \
+		-DCMAKE_CXX_STANDARD=98 \
 		-DBUILD_PROJECTM_STATIC:BOOL=ON .
 	cd $< && $(MAKE) install
 	-cd $<; cp Renderer/libRenderer.a MilkdropPresetFactory/libMilkdropPresetFactory.a $(PREFIX)/lib