Commit f6b2aec1 authored by Martin Storsjö's avatar Martin Storsjö Committed by Jean-Baptiste Kempf
Browse files

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's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 3709f5ff
...@@ -23,6 +23,6 @@ mfx: mfx-$(MFX_GITHASH).tar.xz .sum-mfx ...@@ -23,6 +23,6 @@ mfx: mfx-$(MFX_GITHASH).tar.xz .sum-mfx
$(MOVE) $(MOVE)
.mfx: mfx .mfx: mfx
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CXXFLAGS="-std=c++98 -O2"
cd $< && $(MAKE) install cd $< && $(MAKE) install
touch $@ touch $@
...@@ -35,6 +35,7 @@ DEPS_projectM = glew $(DEPS_glew) ...@@ -35,6 +35,7 @@ DEPS_projectM = glew $(DEPS_glew)
-DUSE_FTGL:BOOL=OFF \ -DUSE_FTGL:BOOL=OFF \
-DINCLUDE-PROJECTM-PULSEAUDIO:BOOL=OFF \ -DINCLUDE-PROJECTM-PULSEAUDIO:BOOL=OFF \
-DINCLUDE-PROJECTM-QT:BOOL=OFF \ -DINCLUDE-PROJECTM-QT:BOOL=OFF \
-DCMAKE_CXX_STANDARD=98 \
-DBUILD_PROJECTM_STATIC:BOOL=ON . -DBUILD_PROJECTM_STATIC:BOOL=ON .
cd $< && $(MAKE) install cd $< && $(MAKE) install
-cd $<; cp Renderer/libRenderer.a MilkdropPresetFactory/libMilkdropPresetFactory.a $(PREFIX)/lib -cd $<; cp Renderer/libRenderer.a MilkdropPresetFactory/libMilkdropPresetFactory.a $(PREFIX)/lib
......
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