Merge branch 'master' of http://github.com/mitchellhansen/voxel-raycaster

include/GL_Testing.h

@@ -1,6 +1,8 @@
 #pragma once
 #include <string>
 #include <util.hpp>
+#include <cstring>
+
 #define GLEW_STATIC
 #include <GL/glew.h>
 

include/Map.h

@@ -12,6 +12,7 @@
 #include <deque>
 #include <unordered_map>
 #include <bitset>
+#include <cstring>
 
 #define _USE_MATH_DEFINES
 #include <math.h>

include/RayCaster.h

@@ -2,7 +2,7 @@
 #include <SFML/System/Vector3.hpp>
 #include <SFML/System/Vector2.hpp>
 #include <Map.h>
-#include "Old_map.h"
+#include "Old_Map.h"
 #include "Camera.h"
 
 

include/Renderer.h

@@ -4,7 +4,7 @@
 #include "SFML/Graphics.hpp"
 #include "CL_Wrapper.h"
 #include "Camera.h"
-#include "Old_map.h"
+#include "Old_Map.h"
 #include "RayCaster.h"
 
 // Renderer needs to handle the distinction between a few difference circumstances.