From e2de459bd38709764cfe2c3425ebbb29c93fde45 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Thu, 5 Jan 2023 01:31:30 -0700 Subject: [PATCH] make include paths absolute within src --- src/game/boe.menu.hpp | 6 +++--- src/game/boe.menus.linux.cpp | 4 ++-- src/pcedit/pc.menus.linux.cpp | 2 +- src/scenedit/scen.menu.hpp | 6 +++--- src/scenedit/scen.menus.linux.cpp | 6 +++--- src/tools/cursors.linux.cpp | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/game/boe.menu.hpp b/src/game/boe.menu.hpp index 0d5ac92a..a720902a 100644 --- a/src/game/boe.menu.hpp +++ b/src/game/boe.menu.hpp @@ -6,12 +6,12 @@ // NOTE: this also includes SFML for us #include #include -#include "universe.hpp" +#include "universe/universe.hpp" #include "boe.consts.hpp" #include "spell.hpp" #include "skills_traits.hpp" -#include "event_listener.hpp" -#include "drawable.hpp" +#include "tools/event_listener.hpp" +#include "tools/drawable.hpp" class OpenBoEMenu : public iEventListener, public iDrawable { public: diff --git a/src/game/boe.menus.linux.cpp b/src/game/boe.menus.linux.cpp index 6c42e9c4..861f387f 100644 --- a/src/game/boe.menus.linux.cpp +++ b/src/game/boe.menus.linux.cpp @@ -9,8 +9,8 @@ #include "boe.menu.hpp" #include "boe.consts.hpp" -#include "event_listener.hpp" -#include "drawable_manager.hpp" +#include "tools/event_listener.hpp" +#include "tools/drawable_manager.hpp" extern sf::RenderWindow mainPtr; extern cUniverse univ; diff --git a/src/pcedit/pc.menus.linux.cpp b/src/pcedit/pc.menus.linux.cpp index 4063c988..83ab56ad 100644 --- a/src/pcedit/pc.menus.linux.cpp +++ b/src/pcedit/pc.menus.linux.cpp @@ -1,7 +1,7 @@ #include "pc.menus.hpp" #include "pc.menu.hpp" -#include "winutil.hpp" +#include "tools/winutil.hpp" #include #include diff --git a/src/scenedit/scen.menu.hpp b/src/scenedit/scen.menu.hpp index 330bdc6e..a165cb1a 100644 --- a/src/scenedit/scen.menu.hpp +++ b/src/scenedit/scen.menu.hpp @@ -6,9 +6,9 @@ // NOTE: this also includes SFML for us #include #include -#include "undo.hpp" -#include "event_listener.hpp" -#include "drawable.hpp" +#include "tools/undo.hpp" +#include "tools/event_listener.hpp" +#include "tools/drawable.hpp" class OpenBoESceneditMenu : public iEventListener, public iDrawable { public: diff --git a/src/scenedit/scen.menus.linux.cpp b/src/scenedit/scen.menus.linux.cpp index ccc18ab0..e1105e28 100644 --- a/src/scenedit/scen.menus.linux.cpp +++ b/src/scenedit/scen.menus.linux.cpp @@ -5,9 +5,9 @@ #include #include #include "scen.menu.hpp" -#include "undo.hpp" -#include "event_listener.hpp" -#include "drawable_manager.hpp" +#include "tools/undo.hpp" +#include "tools/event_listener.hpp" +#include "tools/drawable_manager.hpp" extern sf::RenderWindow mainPtr; extern cUndoList undo_list; diff --git a/src/tools/cursors.linux.cpp b/src/tools/cursors.linux.cpp index 72d6bc96..051ee771 100644 --- a/src/tools/cursors.linux.cpp +++ b/src/tools/cursors.linux.cpp @@ -1,7 +1,7 @@ #include "cursors.hpp" // #include "restypes.hpp" // Include before X11 to avoid macro conflicts in SFML -#include "res_cursor.hpp" +#include "fileio/resmgr/res_cursor.hpp" #include namespace x11 {