fix compilation with glsdk 0.5.2 and g++4.8

Author: paroj

Tut 18 Bumpy Textures/Bumpy Square.cpp

@@ -1,6 +1,7 @@
 #include <string>
 #include <vector>
 #include <exception>
+#include <stdexcept>
 #include <memory>
 #include <stdio.h>
 #include <glload/gl_3_3.h>

framework/Interpolators.h

@@ -7,6 +7,18 @@
 #include <algorithm>
 #include <iterator>
 
+// forward declare some functions needed by instantiations
+// FIXME this is certainly the wrong place for them
+typedef std::pair<float, float> MaxIntensityData;
+typedef std::vector<MaxIntensityData> MaxIntensityVector;
+typedef std::pair<glm::vec4, float> LightVectorData;
+typedef std::vector<LightVectorData> LightVector;
+float distance(const glm::vec3 &lhs, const glm::vec3 &rhs);
+glm::vec4 GetValue(const LightVectorData &data);
+float GetTime(const LightVectorData &data);
+float GetValue(const MaxIntensityData &data);
+float GetTime(const MaxIntensityData &data);
+
 namespace Framework
 {
 	template<typename ValueType>

framework/Mesh.cpp

@@ -10,7 +10,7 @@
 #include <algorithm>
 #include <iostream>
 #include <glload/gl_3_2_comp.h>
-#include <glload/gll.h>
+#include <glload/gl_load.h>
 #include <GL/freeglut.h>
 #include "framework.h"
 #include "Mesh.h"

framework/framework.cpp

@@ -8,7 +8,7 @@
 #include <stdexcept>
 #include <string.h>
 #include <glload/gl_3_3.h>
-#include <glload/gll.hpp>
+#include <glload/gl_load.hpp>
 #include <glutil/Shader.h>
 #include <GL/freeglut.h>
 #include "framework.h"
@@ -87,7 +87,7 @@ void keyboard(unsigned char key, int x, int y);
 unsigned int defaults(unsigned int displayMode, int &width, int &height);
 
 void APIENTRY DebugFunc(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length,
-			   const GLchar* message, GLvoid* userParam)
+			   const GLchar* message, const GLvoid* userParam)
 {
 	std::string srcName;
 	switch(source)

framework/framework.lua

@@ -82,7 +82,7 @@ function SetupProject(projName, ...)
 			links {"glu32", "opengl32", "gdi32", "winmm", "user32"}
 
 	    configuration "linux"
-	        links {"GL", "GLU", "X11"}
+	        links {"GL", "GLU", "X11", "pthread"}
 
 	SetupFrameworkProj()