Merge pull request #3 from caseymcc/master

Fixes for linux

Author: caseymcc

.gitignore

@@ -26,6 +26,7 @@ bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+[Bb]uild/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/

Source/Core/Application/PlatformSpecific.cpp

@@ -71,9 +71,7 @@ namespace Minecraft
 			info.cpu_usage = percent;
 		}
 
-#endif
-
-#ifdef _LINUX
+#else
 		void GetProcDebugInfo(ProcessDebugInfo& info)
 		{
 			// TODO : Get this on linux

Source/Core/Models/Model.h

@@ -1,7 +1,7 @@
 #include <iostream>
 #include <vector>
 
-#include <gl/glew.h>
+#include <GL/glew.h>
 
 #include "../Utils/Defs.h"
 #include "../BlockDatabase.h"

Source/Core/World/World.h

@@ -25,19 +25,11 @@
 #include "../Utils/Ray.h"
 #include "../Clouds/Cloud.h"
 #include "../CubeRenderer.h"
+#include "WorldGeneratorType.h"
 #include "WorldGenerator.h"
 
 namespace Minecraft
 {
-	enum WorldGenerationType 
-	{
-		Generation_Normal = 0,
-		Generation_Normal_withoutcaves,
-		Generation_Hilly,
-		Generation_Flat,
-		Generation_FlatWithoutStructures
-	};
-
 	enum CurrentSunCycle
 	{
 		Sun_Setting,

Source/Core/World/WorldGenerator.h

@@ -11,15 +11,14 @@
 #include "../Noise/FastNoise.h"
 
 #include "World.h"
+#include "WorldGeneratorType.h"
 #include "Structures/WorldStructures.h"
 #include "../Chunk.h"
 #include "../Utils/Random.h"
 #include "../Utils/Defs.h"
 
 namespace Minecraft
 {
-	enum WorldGenerationType;
-
 	enum Biome
 	{
 		Grassland = 9,

Source/Core/World/WorldGeneratorType.h

@@ -0,0 +1,18 @@
+#ifndef _Minecraft_WorldGeneratorType_h_
+#define _Minecraft_WorldGeneratorType_h_
+
+namespace Minecraft
+{
+
+enum WorldGenerationType 
+{
+    Generation_Normal = 0,
+    Generation_Normal_withoutcaves,
+    Generation_Hilly,
+    Generation_Flat,
+    Generation_FlatWithoutStructures
+};
+
+}//namespace Minecraft
+
+#endif//_Minecraft_WorldGeneratorType_h_