don't -I./src

25 files changed, 42 insertions, 44 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbb1248e..1b58b976 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,7 +186,6 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
 endif()
 
 include_directories(.)
-include_directories(src)
 
 #get_property(_fm-sdl2-include-dirs TARGET SDL2::SDL2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
 get_property(_fm-json-include-dirs TARGET nlohmann_json::nlohmann_json PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
diff --git a/draw/anim.cpp b/draw/anim.cpp
index 12d5d0c4..8f2bfa18 100644
--- a/draw/anim.cpp
+++ b/draw/anim.cpp
@@ -1,9 +1,9 @@
 #include "anim.hpp"
-#include "anim-atlas.hpp"
-#include "chunk.hpp"
+#include "src/anim-atlas.hpp"
+#include "src/chunk.hpp"
 #include "shaders/shader.hpp"
 #include "main/clickable.hpp"
-#include "chunk-scenery.hpp"
+#include "src/chunk-scenery.hpp"
 #include <cstdio>
 #include <Corrade/Containers/Optional.h>
 #include <Magnum/GL/MeshView.h>
diff --git a/draw/anim.hpp b/draw/anim.hpp
index 5951e11b..dcfbfe68 100644
--- a/draw/anim.hpp
+++ b/draw/anim.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "local-coords.hpp"
-#include "rotation.hpp"
-#include "chunk.hpp"
+#include "src/local-coords.hpp"
+#include "src/rotation.hpp"
+#include "src/chunk.hpp"
 #include <array>
 #include <Corrade/Containers/Array.h>
 #include <Corrade/Containers/ArrayViewStl.h>
diff --git a/draw/floor.cpp b/draw/floor.cpp
index 8736eea8..31626f1c 100644
--- a/draw/floor.cpp
+++ b/draw/floor.cpp
@@ -1,8 +1,7 @@
 #include "floor.hpp"
 #include "shaders/shader.hpp"
-#include "tile.hpp"
-#include "chunk.hpp"
-#include "tile-atlas.hpp"
+#include "src/chunk.hpp"
+#include "src/tile-atlas.hpp"
 #include "compat/assert.hpp"
 #include <Magnum/GL/MeshView.h>
 
diff --git a/draw/wall.cpp b/draw/wall.cpp
index 81cd7903..0a0a0b5a 100644
--- a/draw/wall.cpp
+++ b/draw/wall.cpp
@@ -1,9 +1,9 @@
 #include "wall.hpp"
-#include "tile-atlas.hpp"
+#include "src/tile-atlas.hpp"
 #include "shaders/shader.hpp"
-#include "chunk.hpp"
-#include "tile-image.hpp"
-#include "anim-atlas.hpp"
+#include "src/chunk.hpp"
+#include "src/tile-image.hpp"
+#include "src/anim-atlas.hpp"
 #include <Magnum/GL/Texture.h>
 #include <Magnum/GL/MeshView.h>
 
diff --git a/draw/wireframe.hpp b/draw/wireframe.hpp
index 922936ae..ba42bac3 100644
--- a/draw/wireframe.hpp
+++ b/draw/wireframe.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "tile-defs.hpp"
+#include "src/tile-defs.hpp"
 #include <Magnum/GL/Buffer.h>
 #include <Magnum/GL/Mesh.h>
 #include "Magnum/GL/Texture.h"
diff --git a/editor/app.cpp b/editor/app.cpp
index de1f8ef3..ace6718a 100644
--- a/editor/app.cpp
+++ b/editor/app.cpp
@@ -4,7 +4,7 @@
 #include "floormat/main.hpp"
 #include "floormat/settings.hpp"
 #include "loader/loader.hpp"
-#include "world.hpp"
+#include "src/world.hpp"
 #include "src/anim-atlas.hpp"
 #include "src/critter.hpp"
 #include <cerrno>
diff --git a/editor/app.hpp b/editor/app.hpp
index b86ab3b9..b0f2aa8e 100644
--- a/editor/app.hpp
+++ b/editor/app.hpp
@@ -10,7 +10,7 @@
 #include "draw/box.hpp"
 #include "floormat/app.hpp"
 #include "keys.hpp"
-#include "object-id.hpp"
+#include "src/object-id.hpp"
 #include <memory>
 #include <Corrade/Containers/Pointer.h>
 #include <Corrade/Containers/Optional.h>
diff --git a/editor/draw.cpp b/editor/draw.cpp
index c898ed35..429ce0fc 100644
--- a/editor/draw.cpp
+++ b/editor/draw.cpp
@@ -9,7 +9,7 @@
 #include "src/world.hpp"
 #include "src/critter.hpp"
 
-#include "rotation.inl"
+#include "src/rotation.inl"
 #include "src/RTree-search.hpp"
 
 #include <Magnum/Math/Color.h>
diff --git a/editor/editor.cpp b/editor/editor.cpp
index f91467aa..028e02fe 100644
--- a/editor/editor.cpp
+++ b/editor/editor.cpp
@@ -1,6 +1,6 @@
 #include "editor.hpp"
 #include "loader/loader.hpp"
-#include "tile-atlas.hpp"
+#include "src/tile-atlas.hpp"
 #include "src/world.hpp"
 #include "keys.hpp"
 
diff --git a/editor/editor.hpp b/editor/editor.hpp
index 60e257d2..8fa3a859 100644
--- a/editor/editor.hpp
+++ b/editor/editor.hpp
@@ -1,8 +1,8 @@
 #pragma once
 #include "compat/defs.hpp"
-#include "global-coords.hpp"
-#include "tile-image.hpp"
-#include "scenery.hpp"
+#include "src/global-coords.hpp"
+#include "src/tile-image.hpp"
+#include "src/scenery.hpp"
 #include "editor-enums.hpp"
 #include "tile-editor.hpp"
 #include "scenery-editor.hpp"
diff --git a/editor/imgui-editors.cpp b/editor/imgui-editors.cpp
index a0aff447..5bcc8ca0 100644
--- a/editor/imgui-editors.cpp
+++ b/editor/imgui-editors.cpp
@@ -1,6 +1,6 @@
 #include "app.hpp"
 #include "imgui-raii.hpp"
-#include "anim-atlas.hpp"
+#include "src/anim-atlas.hpp"
 #include "loader/loader.hpp"
 #include "floormat/main.hpp"
 #include <Magnum/Math/Color.h>
diff --git a/editor/inspect-types.cpp b/editor/inspect-types.cpp
index 5996597f..7690d91d 100644
--- a/editor/inspect-types.cpp
+++ b/editor/inspect-types.cpp
@@ -5,7 +5,7 @@
 #include "src/tile-defs.hpp"
 #include "inspect.hpp"
 #include "loader/loader.hpp"
-#include "chunk.hpp"
+#include "src/chunk.hpp"
 #include "src/critter.hpp"
 
 #include "src/light.hpp"
diff --git a/editor/scenery-editor.cpp b/editor/scenery-editor.cpp
index 19a24e99..511e5b6a 100644
--- a/editor/scenery-editor.cpp
+++ b/editor/scenery-editor.cpp
@@ -4,7 +4,7 @@
 #include "compat/assert.hpp"
 #include "src/world.hpp"
 #include "src/RTree-search.hpp"
-#include "rotation.inl"
+#include "src/rotation.inl"
 #include "app.hpp"
 #include <Magnum/Math/Range.h>
 
diff --git a/editor/scenery-editor.hpp b/editor/scenery-editor.hpp
index 8b497015..f3c3780b 100644
--- a/editor/scenery-editor.hpp
+++ b/editor/scenery-editor.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "scenery.hpp"
+#include "src/scenery.hpp"
 #include <map>
 #include <memory>
 #include <Corrade/Containers/String.h>
diff --git a/editor/tile-editor.cpp b/editor/tile-editor.cpp
index 68fc0930..2dd8a16d 100644
--- a/editor/tile-editor.cpp
+++ b/editor/tile-editor.cpp
@@ -1,9 +1,9 @@
 #include "tile-editor.hpp"
-#include "tile-atlas.hpp"
-#include "world.hpp"
+#include "src/tile-atlas.hpp"
+#include "src/world.hpp"
+#include "src/random.hpp"
 #include "keys.hpp"
 #include "loader/loader.hpp"
-#include "random.hpp"
 #include "compat/exception.hpp"
 #include <Corrade/Containers/PairStl.h>
 #include <Corrade/Utility/Path.h>
diff --git a/editor/tile-editor.hpp b/editor/tile-editor.hpp
index 321b75c6..82f020df 100644
--- a/editor/tile-editor.hpp
+++ b/editor/tile-editor.hpp
@@ -2,7 +2,7 @@
 
 #include "editor-enums.hpp"
 #include "src/tile-image.hpp"
-#include "global-coords.hpp"
+#include "src/global-coords.hpp"
 #include <vector>
 #include <map>
 #include <memory>
diff --git a/serialize/scenery.cpp b/serialize/scenery.cpp
index 33f81285..8519fd49 100644
--- a/serialize/scenery.cpp
+++ b/serialize/scenery.cpp
@@ -1,6 +1,6 @@
 #include "scenery.hpp"
 #include "compat/exception.hpp"
-#include "anim-atlas.hpp"
+#include "src/anim-atlas.hpp"
 #include "compat/assert.hpp"
 #include "loader/loader.hpp"
 #include "serialize/corrade-string.hpp"
diff --git a/shaders/lightmap.hpp b/shaders/lightmap.hpp
index 2a0869bc..ff2dd9b4 100644
--- a/shaders/lightmap.hpp
+++ b/shaders/lightmap.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "light-falloff.hpp"
+#include "src/light-falloff.hpp"
 #include "shaders/texture-unit-cache.hpp"
 #include <array>
 #include <Corrade/Containers/Array.h>
diff --git a/shaders/shader.cpp b/shaders/shader.cpp
index 22222842..a276f053 100644
--- a/shaders/shader.cpp
+++ b/shaders/shader.cpp
@@ -1,7 +1,7 @@
 #include "shaders/shader.hpp"
 #include "loader/loader.hpp"
 #include "compat/assert.hpp"
-#include "local-coords.hpp"
+#include "src/local-coords.hpp"
 #include <cmath>
 #include <Corrade/Containers/Iterable.h>
 #include <Corrade/Containers/StringStl.h>
diff --git a/shaders/shader.hpp b/shaders/shader.hpp
index c163b1dc..c50f4681 100644
--- a/shaders/shader.hpp
+++ b/shaders/shader.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "tile-defs.hpp"
+#include "src/tile-defs.hpp"
 #include "shaders/texture-unit-cache.hpp"
 #include <utility>
 #include <Magnum/GL/AbstractShaderProgram.h>
diff --git a/test/dijkstra.cpp b/test/dijkstra.cpp
index 2cf32451..8b56e505 100644
--- a/test/dijkstra.cpp
+++ b/test/dijkstra.cpp
@@ -1,5 +1,5 @@
 #include "app.hpp"
-#include "path-search.hpp"
+#include "src/path-search.hpp"
 #include "loader/loader.hpp"
 #include <Magnum/Math/Functions.h>
 #include <chrono>
diff --git a/test/json.cpp b/test/json.cpp
index 9c638530..c819c599 100644
--- a/test/json.cpp
+++ b/test/json.cpp
@@ -4,12 +4,12 @@
 #include "serialize/tile.hpp"
 #include "serialize/json-helper.hpp"
 #include "compat/assert.hpp"
-#include "tile-atlas.hpp"
-#include "tile.hpp"
-#include "chunk.hpp"
-#include "world.hpp"
+#include "src/tile-atlas.hpp"
+#include "src/tile.hpp"
+#include "src/tile-iterator.hpp"
+#include "src/chunk.hpp"
+#include "src/world.hpp"
 #include "loader/loader.hpp"
-#include "tile-iterator.hpp"
 #include <Corrade/Containers/StringView.h>
 #include <Corrade/Utility/Path.h>
 
diff --git a/test/path-search-result.cpp b/test/path-search-result.cpp
index 427de52a..705eca78 100644
--- a/test/path-search-result.cpp
+++ b/test/path-search-result.cpp
@@ -1,6 +1,6 @@
 #include "app.hpp"
 #include "compat/assert.hpp"
-#include "path-search-result.hpp"
+#include "src/path-search-result.hpp"
 
 namespace floormat {
 
diff --git a/test/tile-iter.cpp b/test/tile-iter.cpp
index 5248f7ce..086fd3ce 100644
--- a/test/tile-iter.cpp
+++ b/test/tile-iter.cpp
@@ -1,7 +1,7 @@
 #include "app.hpp"
-#include "chunk.hpp"
-#include "world.hpp"
-#include "tile-iterator.hpp"
+#include "src/chunk.hpp"
+#include "src/world.hpp"
+#include "src/tile-iterator.hpp"
 namespace floormat {
 
 static inline bool always_false()