Put Collision folder in CMakeLists.txt and altered paths.

This commit is contained in:
William Moberg
2015-12-14 17:35:39 +01:00
parent e6fa9df3a5
commit ae7d4b9097
9 changed files with 18 additions and 10 deletions
+7
View File
@@ -70,6 +70,12 @@ file(GLOB SOURCE_FILES_GUI
)
source_group(GUI FILES ${SOURCE_FILES_GUI})
file(GLOB SOURCE_FILES_Collision
"${INCLUDE_PATH}/Collision/*.h"
"Collision/*.cpp"
)
source_group(Collision FILES ${SOURCE_FILES_Collision})
set(SOURCE_FILES
${SOURCE_FILES_Core}
${SOURCE_FILES_Core_Util}
@@ -78,6 +84,7 @@ set(SOURCE_FILES
${SOURCE_FILES_GUI}
${SOURCE_FILES_Rendering}
${SOURCE_FILES_Rendering_Util}
${SOURCE_FILES_Collision}
)
set(LIBRARIES
+1 -1
View File
@@ -1,6 +1,6 @@
#include <algorithm>
#include "Core/Collision.h"
#include "Collision/Collision.h"
#include "Engine/GLM.h"
namespace Collision
+1 -1
View File
@@ -3,7 +3,7 @@
#include <bitset>
#include "Core/OctTree.h"
#include "Core/Collision.h"
#include "Collision/Collision.h"
#include "Core/World.h"
#include "Rendering/Camera.h"