From 811e0d1e99b7278ad262c8f8032d496bdd2be48e Mon Sep 17 00:00:00 2001 From: Damien Bendejacq Date: Wed, 22 Nov 2017 20:16:51 +0100 Subject: [PATCH] Add project src to include directories. --- CMakeLists.txt | 2 ++ src/app.hpp | 1 - src/scene/1player/1playerScene.cpp | 4 ++-- src/scene/1player/state/1playerGameOverState.cpp | 4 ++-- src/scene/1player/state/1playerGameState.cpp | 2 +- src/scene/2players/2playersScene.cpp | 4 ++-- src/scene/2players/state/2playersGameOverState.cpp | 4 ++-- src/scene/2players/state/2playersGameState.cpp | 2 +- src/scene/menu/menuScene.cpp | 6 +++--- src/scene/wall/state/wallGameOverState.cpp | 2 +- src/scene/wall/state/wallGameState.cpp | 2 +- src/scene/wall/wallScene.cpp | 4 ++-- 12 files changed, 19 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5129de6..a9c2603 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,8 @@ include_directories(${PROJECT_SOURCE_DIR}/external/jackbengine/include) include_directories(${PROJECT_SOURCE_DIR}/external/jackbengine/src) include_directories(${PROJECT_SOURCE_DIR}/external/jackbengine/external) +include_directories(${PROJECT_SOURCE_DIR}/src) + # Using Resource generator tool add_executable( resourceGenerator diff --git a/src/app.hpp b/src/app.hpp index 717959c..c081842 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -11,7 +11,6 @@ #include "jackbengine.hpp" #include "scene/menu/menuScene.hpp" -#include "scene/2players/2playersScene.hpp" using namespace Jackbengine; diff --git a/src/scene/1player/1playerScene.cpp b/src/scene/1player/1playerScene.cpp index d129c86..5ba28c4 100644 --- a/src/scene/1player/1playerScene.cpp +++ b/src/scene/1player/1playerScene.cpp @@ -7,11 +7,11 @@ // #include "1playerScene.hpp" -#include "../const.hpp" +#include "scene/const.hpp" #include "state/1playerServiceState.hpp" #include "state/1playerGameState.hpp" #include "state/1playerGameOverState.hpp" -#include "../menu/menuScene.hpp" +#include "scene/menu/menuScene.hpp" IMPORT_TEXT_RESOURCE(one_player_tmx) IMPORT_BINARY_RESOURCE(tileset_png) diff --git a/src/scene/1player/state/1playerGameOverState.cpp b/src/scene/1player/state/1playerGameOverState.cpp index be249e5..333e462 100644 --- a/src/scene/1player/state/1playerGameOverState.cpp +++ b/src/scene/1player/state/1playerGameOverState.cpp @@ -7,8 +7,8 @@ // #include "1playerGameOverState.hpp" -#include "../../menu/menuScene.hpp" -#include "../../const.hpp" +#include "scene/menu/menuScene.hpp" +#include "scene/const.hpp" OnePlayerGameOverState::OnePlayerGameOverState(StateMachine& stateMachine, Scene& scene, TmxSceneLoader& sceneLoader) : SceneState(stateMachine, scene), diff --git a/src/scene/1player/state/1playerGameState.cpp b/src/scene/1player/state/1playerGameState.cpp index 7a72a0d..bdeeb10 100644 --- a/src/scene/1player/state/1playerGameState.cpp +++ b/src/scene/1player/state/1playerGameState.cpp @@ -9,7 +9,7 @@ #include "1playerGameState.hpp" #include "1playerServiceState.hpp" #include "1playerGameOverState.hpp" -#include "../../const.hpp" +#include "scene/const.hpp" OnePlayerGameState::OnePlayerGameState(StateMachine& stateMachine, Scene& scene, TmxSceneLoader& sceneLoader) : SceneState(stateMachine, scene), diff --git a/src/scene/2players/2playersScene.cpp b/src/scene/2players/2playersScene.cpp index 0d56942..4cfedb8 100644 --- a/src/scene/2players/2playersScene.cpp +++ b/src/scene/2players/2playersScene.cpp @@ -7,11 +7,11 @@ // #include "2playersScene.hpp" -#include "../const.hpp" +#include "scene/const.hpp" #include "state/2playersServiceState.hpp" #include "state/2playersGameState.hpp" #include "state/2playersGameOverState.hpp" -#include "../menu/menuScene.hpp" +#include "scene/menu/menuScene.hpp" IMPORT_TEXT_RESOURCE(two_players_tmx) IMPORT_BINARY_RESOURCE(tileset_png) diff --git a/src/scene/2players/state/2playersGameOverState.cpp b/src/scene/2players/state/2playersGameOverState.cpp index 3bfb40e..01094ea 100644 --- a/src/scene/2players/state/2playersGameOverState.cpp +++ b/src/scene/2players/state/2playersGameOverState.cpp @@ -7,8 +7,8 @@ // #include "2playersGameOverState.hpp" -#include "../../menu/menuScene.hpp" -#include "../../const.hpp" +#include "scene/menu/menuScene.hpp" +#include "scene/const.hpp" TwoPlayersGameOverState::TwoPlayersGameOverState(StateMachine& stateMachine, Scene& scene, TmxSceneLoader& sceneLoader) : SceneState(stateMachine, scene), diff --git a/src/scene/2players/state/2playersGameState.cpp b/src/scene/2players/state/2playersGameState.cpp index a9f43e4..2f820f7 100644 --- a/src/scene/2players/state/2playersGameState.cpp +++ b/src/scene/2players/state/2playersGameState.cpp @@ -9,7 +9,7 @@ #include "2playersGameState.hpp" #include "2playersServiceState.hpp" #include "2playersGameOverState.hpp" -#include "../../const.hpp" +#include "scene/const.hpp" TwoPlayersGameState::TwoPlayersGameState(StateMachine& stateMachine, Scene& scene, TmxSceneLoader& sceneLoader) : SceneState(stateMachine, scene), diff --git a/src/scene/menu/menuScene.cpp b/src/scene/menu/menuScene.cpp index 3e1fec7..8fc99e1 100644 --- a/src/scene/menu/menuScene.cpp +++ b/src/scene/menu/menuScene.cpp @@ -7,9 +7,9 @@ // #include "menuScene.hpp" -#include "../wall/wallScene.hpp" -#include "../2players/2playersScene.hpp" -#include "../1player/1playerScene.hpp" +#include "scene/wall/wallScene.hpp" +#include "scene/2players/2playersScene.hpp" +#include "scene/1player/1playerScene.hpp" IMPORT_TEXT_RESOURCE(menu_tmx) IMPORT_BINARY_RESOURCE(default_font) diff --git a/src/scene/wall/state/wallGameOverState.cpp b/src/scene/wall/state/wallGameOverState.cpp index 2c55ab2..adb191b 100644 --- a/src/scene/wall/state/wallGameOverState.cpp +++ b/src/scene/wall/state/wallGameOverState.cpp @@ -7,7 +7,7 @@ // #include "wallGameOverState.hpp" -#include "../../menu/menuScene.hpp" +#include "scene/menu/menuScene.hpp" WallGameOverState::WallGameOverState(StateMachine& stateMachine, Scene& scene, TmxSceneLoader& sceneLoader) : SceneState(stateMachine, scene), diff --git a/src/scene/wall/state/wallGameState.cpp b/src/scene/wall/state/wallGameState.cpp index fba0cdc..cccdb02 100644 --- a/src/scene/wall/state/wallGameState.cpp +++ b/src/scene/wall/state/wallGameState.cpp @@ -7,7 +7,7 @@ // #include "wallGameState.hpp" -#include "../../const.hpp" +#include "scene/const.hpp" #include "wallGameOverState.hpp" WallGameState::WallGameState(StateMachine& stateMachine, Scene& scene, TmxSceneLoader& sceneLoader) diff --git a/src/scene/wall/wallScene.cpp b/src/scene/wall/wallScene.cpp index e2dd562..4ea3ba5 100644 --- a/src/scene/wall/wallScene.cpp +++ b/src/scene/wall/wallScene.cpp @@ -7,11 +7,11 @@ // #include "wallScene.hpp" -#include "../const.hpp" +#include "scene/const.hpp" #include "state/wallServiceState.hpp" #include "state/wallGameState.hpp" #include "state/wallGameOverState.hpp" -#include "../menu/menuScene.hpp" +#include "scene/menu/menuScene.hpp" IMPORT_TEXT_RESOURCE(wall_tmx) IMPORT_BINARY_RESOURCE(tileset_png)