From 0047db0a65169e162ed45d6d5b7b279263816075 Mon Sep 17 00:00:00 2001 From: MitchellHansen Date: Wed, 8 Feb 2017 01:35:14 -0800 Subject: [PATCH] Not sure if I'm a huge fan that I have to specify the folders in the includes now --- CMakeLists.txt | 4 ---- include/LightController.h | 2 +- include/raycaster/Hardware_Caster.h | 2 +- src/main.cpp | 6 +++--- src/raycaster/Hardware_Caster.cpp | 3 +-- src/raycaster/RayCaster.cpp | 2 +- src/raycaster/Software_Caster.cpp | 2 +- 7 files changed, 8 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dd8035d..d5b51cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,7 +63,6 @@ foreach (source IN ITEMS ${SOURCES}) string(REGEX MATCHALL "src(.*)" substrings ${filename}) list(GET substrings 0 substring) - SOURCE_GROUP(${substring} FILES ${source}) @@ -79,7 +78,6 @@ foreach (source IN ITEMS ${HEADERS}) string(REGEX MATCHALL "include(.*)" substrings ${filename}) list(GET substrings 0 substring) - SOURCE_GROUP(${substring} FILES ${source}) @@ -95,7 +93,6 @@ foreach (source IN ITEMS ${KERNELS}) string(REGEX MATCHALL "kernels(.*)" substrings ${filename}) list(GET substrings 0 substring) - SOURCE_GROUP(${substring} FILES ${source}) @@ -111,7 +108,6 @@ foreach (source IN ITEMS ${SHADERS}) string(REGEX MATCHALL "shaders(.*)" substrings ${filename}) list(GET substrings 0 substring) - SOURCE_GROUP(${substring} FILES ${source}) diff --git a/include/LightController.h b/include/LightController.h index 12bd413..5d96b44 100644 --- a/include/LightController.h +++ b/include/LightController.h @@ -3,7 +3,7 @@ #include #include "util.hpp" #include "Pub_Sub.h" -#include "RayCaster.h" +#include "raycaster/RayCaster.h" #include "LightHandle.h" diff --git a/include/raycaster/Hardware_Caster.h b/include/raycaster/Hardware_Caster.h index ee6bf4e..9b663a4 100644 --- a/include/raycaster/Hardware_Caster.h +++ b/include/raycaster/Hardware_Caster.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include #include #include "util.hpp" diff --git a/src/main.cpp b/src/main.cpp index 44f9200..68007a6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,11 +28,11 @@ #include #include "Old_Map.h" #include "util.hpp" -#include "RayCaster.h" -#include "Hardware_Caster.h" +#include "raycaster/RayCaster.h" +#include "raycaster/Hardware_Caster.h" #include "Vector4.hpp" #include "Camera.h" -#include "Software_Caster.h" +#include "raycaster/Software_Caster.h" #include "Input.h" #include "Pub_Sub.h" #include "NetworkInput.h" diff --git a/src/raycaster/Hardware_Caster.cpp b/src/raycaster/Hardware_Caster.cpp index 1ee91dd..bc18eaa 100644 --- a/src/raycaster/Hardware_Caster.cpp +++ b/src/raycaster/Hardware_Caster.cpp @@ -1,5 +1,4 @@ -#include "Hardware_Caster.h" - +#include "raycaster/Hardware_Caster.h" Hardware_Caster::Hardware_Caster() { diff --git a/src/raycaster/RayCaster.cpp b/src/raycaster/RayCaster.cpp index 721b4cb..bbbc3aa 100644 --- a/src/raycaster/RayCaster.cpp +++ b/src/raycaster/RayCaster.cpp @@ -1,4 +1,4 @@ -#include "RayCaster.h" +#include "raycaster/RayCaster.h" RayCaster::RayCaster() { } diff --git a/src/raycaster/Software_Caster.cpp b/src/raycaster/Software_Caster.cpp index 5e664b4..befb337 100644 --- a/src/raycaster/Software_Caster.cpp +++ b/src/raycaster/Software_Caster.cpp @@ -1,4 +1,4 @@ -#include "Software_Caster.h" +#include "raycaster/Software_Caster.h"