loader: fix static initializer mess

1 files changed, 7 insertions, 6 deletions

diff --git a/loader/loader.hpp b/loader/loader.hpp
index 32158675..3320b839 100644
--- a/loader/loader.hpp
+++ b/loader/loader.hpp
@@ -1,12 +1,10 @@
 #pragma once
-
 #include <memory>
-#include <Corrade/Containers/ArrayView.h>
-#include <Corrade/Containers/StringView.h>
-#include <Magnum/Trade/ImageData.h>
 
-#define FM_IMAGE_PATH "share/floormat/images/"
-#define FM_ANIM_PATH "share/floormat/anim/"
+namespace Corrade::Containers { template<typename T> class ArrayView; class String; }
+namespace Corrade::Containers { template<typename T> class BasicStringView; using StringView = BasicStringView<const char>; }
+namespace Magnum::Math { template<class T> class Vector2; }
+namespace Magnum { using Vector2ub = Math::Vector2<unsigned char>; }
 
 namespace floormat {
 
@@ -27,6 +25,9 @@ struct loader_
 
     virtual ~loader_();
 
+    static const StringView IMAGE_PATH;
+    static const StringView ANIM_PATH;
+
 protected:
     loader_();
 };