From b4b64abc1ec6224ccf13bf7afcbf56a700be20ad Mon Sep 17 00:00:00 2001
From: sippeangelo <holmerg.simon@gmail.com>
Date: Tue, 1 Dec 2015 09:51:15 +0100
Subject: [PATCH 1/4] Made Rendering/Util visible to CMake project

---
 src/Engine/CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Engine/CMakeLists.txt b/src/Engine/CMakeLists.txt
index 861573a3..7bc15041 100644
--- a/src/Engine/CMakeLists.txt
+++ b/src/Engine/CMakeLists.txt
@@ -48,7 +48,12 @@ file(GLOB SOURCE_FILES_Rendering
     "${INCLUDE_PATH}/Rendering/*.h"
     "Rendering/*.cpp"
 )
+file(GLOB SOURCE_FILES_Rendering_Util
+    "${INCLUDE_PATH}/Rendering/Util/*.h"
+    "Rendering/Util/*.cpp"
+)
 source_group(Rendering FILES ${SOURCE_FILES_Rendering})
+source_group(Rendering\\Util FILES ${SOURCE_FILES_Rendering_Util})
 
 file(GLOB SOURCE_FILES_GUI
     "${INCLUDE_PATH}/GUI/*.h"

From cf349870dee05907d92c130463d9815558d93283 Mon Sep 17 00:00:00 2001
From: sippeangelo <holmerg.simon@gmail.com>
Date: Tue, 1 Dec 2015 10:40:33 +0100
Subject: [PATCH 2/4] Simplified CMake for Game

---
 src/Game/CMakeLists.txt | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/Game/CMakeLists.txt b/src/Game/CMakeLists.txt
index 2fceae1e..b513fa92 100644
--- a/src/Game/CMakeLists.txt
+++ b/src/Game/CMakeLists.txt
@@ -1,31 +1,13 @@
 project(TacticalZ-Game)
 
-find_package(OpenGL REQUIRED)
-find_package(GLEW REQUIRED)
-find_package(GLFW REQUIRED)
 find_package(Boost REQUIRED COMPONENTS system filesystem thread chrono)
-find_package(assimp REQUIRED)
-find_package(ZLIB REQUIRED)
-find_package(PNG REQUIRED)
-# Because FindOpenAL is retarded
-#set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${CMAKE_SOURCE_DIR}/deps/include/AL")
-#find_package(OpenAL REQUIRED)
-if(UNIX)
-    find_package(X11 REQUIRED)
-endif()
 
 set(INCLUDE_PATH ${CMAKE_SOURCE_DIR}/include/Game)
 include_directories(
     ${CMAKE_SOURCE_DIR}/include/Engine
+    ${CMAKE_SOURCE_DIR}/deps/include
     ${INCLUDE_PATH}
-    ${OPENGL_INCLUDE_DIR}
-    ${GLEW_INCLUDE_DIRS}
-    ${GLFW_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
-    ${assimp_INCLUDE_DIRS}
-    ${PNG_INCLUDE_DIRS}
-    ${OPENAL_INCLUDE_DIR}
-    ${X11_INCLUDE_DIRS}
 )
 
 file(GLOB SOURCE_FILES

From ae759654c1cd1221d516018411dea70c7d5a26aa Mon Sep 17 00:00:00 2001
From: sippeangelo <holmerg.simon@gmail.com>
Date: Tue, 1 Dec 2015 11:21:33 +0100
Subject: [PATCH 3/4] Made deploy create a bin folder so it doesn't fail if
 it's missing

---
 tools/deploy.bat | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/deploy.bat b/tools/deploy.bat
index b3f51c07..cdab1c20 100755
--- a/tools/deploy.bat
+++ b/tools/deploy.bat
@@ -1,6 +1,7 @@
 @ECHO off
 
 SET DeployLocation=bin\
+MKDIR %DeployLocation%
 
 ECHO Deploying assets to %DeployLocation%
 :: Asset folders

From f65b7d591cf39884cb558dd780f66a0bd22d0c7a Mon Sep 17 00:00:00 2001
From: sippeangelo <holmerg.simon@gmail.com>
Date: Wed, 2 Dec 2015 15:02:18 +0100
Subject: [PATCH 4/4] Fixed Tests running the game when it really shouldn't.

---
 src/Game/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Game/CMakeLists.txt b/src/Game/CMakeLists.txt
index b513fa92..41cc30eb 100644
--- a/src/Game/CMakeLists.txt
+++ b/src/Game/CMakeLists.txt
@@ -12,12 +12,13 @@ include_directories(
 
 file(GLOB SOURCE_FILES
     "${INCLUDE_PATH}/*.h"
-    "*.cpp"
+    #"*.cpp"
 )
 #source_group(Core FILES ${SOURCE_FILES})
 
 set(SOURCE_FILES
     ${SOURCE_FILES}
+    "Game.cpp"
 )
 
 set(LIBRARIES