Merge branch 'glsl' of github.com:projectM-visualizer/projectm into glsl

configure.ac

@@ -101,6 +101,9 @@ AC_PREFIX_DEFAULT([/usr/local])
 
 AC_PROG_MKDIR_P
 
+AX_CHECK_COMPILE_FLAG([-std=c++14], [
+                        CXXFLAGS="$CXXFLAGS -std=c++14"])
+
 dnl Qt
 AC_ARG_ENABLE([qt],
   AS_HELP_STRING([--enable-qt], [Build Qt]),

src/libprojectM/Renderer/HLSLTranslator.cpp

@@ -1,6 +1,8 @@
 #ifndef HLSLTRANSLATOR_CPP_
 #define HLSLTRANSLATOR_CPP_
 
+#include <memory>
+
 #include "HLSLTranslator.hpp"
 
 using namespace M4;

src/libprojectM/Renderer/HLSLTranslator.hpp

@@ -22,6 +22,7 @@
 #include <sys/types.h>
 #include "projectM-opengl.h"
 #include <iostream>
+#include <memory>
 #include <cstdlib>
 
 class HLSLTranslator {

src/libprojectM/Renderer/Makefile.am

@@ -1,4 +1,3 @@
-SUBDIRS = hlslparser
 
 noinst_LTLIBRARIES = libRenderer.la
 

src/libprojectM/Renderer/ShaderEngine.hpp

@@ -16,7 +16,6 @@ class ShaderEngine;
 #include "PipelineContext.hpp"
 #include "TextureManager.hpp"
 #include "BeatDetect.hpp"
-#include "HLSLTranslator.hpp"
 
 #include <cstdlib>
 #include <iostream>