From 6b875a0919b9932eca9ed877552c34ecb220b7d8 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 23 Oct 2022 13:08:48 +0200
Subject: some random stuff

---
 draw/precomp.hpp        | 2 --
 external/CMakeLists.txt | 1 +
 main/app.cpp            | 5 ++---
 main/app.hpp            | 3 +--
 main/precomp.hpp        | 1 +
 main/update.cpp         | 6 +++---
 src/precomp.hpp         | 4 +++-
 7 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 draw/precomp.hpp

diff --git a/draw/precomp.hpp b/draw/precomp.hpp
deleted file mode 100644
index e81a58f0..00000000
--- a/draw/precomp.hpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "src/precomp.hpp"
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 84523241..d04565c3 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -56,6 +56,7 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES)
 
          MAGNUM_BUILD_STATIC                    OFF
          MAGNUM_BUILD_TESTS                     OFF
+         MAGNUM_BUILD_DEPRECATED                ON
 
          MAGNUM_WITH_ANYIMAGECONVERTER          ON
          MAGNUM_WITH_ANYIMAGEIMPORTER           ON
diff --git a/main/app.cpp b/main/app.cpp
index 523bb49e..d6593227 100644
--- a/main/app.cpp
+++ b/main/app.cpp
@@ -5,7 +5,6 @@
 #include <Corrade/Utility/Arguments.h>
 #include <Corrade/Utility/DebugStl.h>
 #include <Magnum/GL/DefaultFramebuffer.h>
-#include <Magnum/GL/TextureFormat.h>
 
 #ifdef FM_MSAA
 #include <Magnum/GL/RenderbufferFormat.h>
@@ -32,13 +31,13 @@ void app::usage(const Utility::Arguments& args)
 }
 
 app::app(const Arguments& arguments, app_settings opts):
-      Platform::Application{
+      Platform::Sdl2Application{
           arguments,
           Configuration{}
               .setTitle("Test")
               .setSize({1024, 768}, dpi_policy::Physical)
               .setWindowFlags(Configuration::WindowFlag::Resizable),
-          GLConfiguration{},
+          GLConfiguration{}
       },
       _settings{opts}
 {
diff --git a/main/app.hpp b/main/app.hpp
index bf0330ce..8970aa15 100644
--- a/main/app.hpp
+++ b/main/app.hpp
@@ -12,7 +12,6 @@
 #include "editor.hpp"
 #include "world.hpp"
 #include <Magnum/Timeline.h>
-#include <Magnum/Platform/Sdl2Application.h>
 #include <Magnum/GL/DebugOutput.h>
 #include <Magnum/Platform/Sdl2Application.h>
 #include <Magnum/ImGuiIntegration/Context.h>
@@ -27,7 +26,7 @@
 
 namespace floormat {
 
-struct app final : private Platform::Application
+struct app final : private Platform::Sdl2Application
 {
     static int run_from_argv(int argc, char** argv);
     virtual ~app();
diff --git a/main/precomp.hpp b/main/precomp.hpp
index 1dc47507..0727f83d 100644
--- a/main/precomp.hpp
+++ b/main/precomp.hpp
@@ -14,6 +14,7 @@
 #include <Magnum/GL/DefaultFramebuffer.h>
 #include <Magnum/GL/Framebuffer.h>
 #include <Magnum/GL/MultisampleTexture.h>
+#include <Magnum/GL/Renderbuffer.h>
 #include <Magnum/GL/TextureFormat.h>
 #include <Magnum/ImGuiIntegration/Context.h>
 #include <Magnum/Platform/Sdl2Application.h>
diff --git a/main/update.cpp b/main/update.cpp
index 172b2ebd..ebd1881b 100644
--- a/main/update.cpp
+++ b/main/update.cpp
@@ -2,20 +2,20 @@
 
 namespace floormat {
 
-//#define TEST_NO_BINDINGS
+//#define FM_NO_BINDINGS
 
 void app::make_test_chunk(chunk& c)
 {
     constexpr auto N = TILE_MAX_DIM;
     for (auto [x, k, pt] : c) {
-#ifdef TEST_NO_BINDINGS
+#if defined FM_NO_BINDINGS
         const auto& atlas = floor1;
 #else
         const auto& atlas = pt.x != pt.y && (pt.x == N/2 || pt.y == N/2) ? floor2 : floor1;
 #endif
         x.ground_image = { atlas, k % atlas->num_tiles() };
     }
-#ifdef TEST_NO_BINDINGS
+#ifdef FM_NO_BINDINGS
     const auto& wall1 = floor1, wall2 = floor1;
 #endif
     constexpr auto K = N/2;
diff --git a/src/precomp.hpp b/src/precomp.hpp
index ceeeca70..4ff5d8a7 100644
--- a/src/precomp.hpp
+++ b/src/precomp.hpp
@@ -18,11 +18,12 @@
 #include <vector>
 #include <memory>
 #include <utility>
+#include <algorithm>
 #include <filesystem>
 
-#include <Corrade/Containers/StringStlView.h>
 #include <Corrade/Containers/Array.h>
 #include <Corrade/Containers/ArrayViewStl.h>
+#include <Corrade/Containers/StringStlView.h>
 #include <Corrade/Utility/DebugStl.h>
 
 #include <Magnum/Magnum.h>
@@ -36,4 +37,5 @@
 #include <Magnum/GL/Renderer.h>
 #include <Magnum/GL/Texture.h>
 #include <Magnum/Trade/ImageData.h>
+
 #include <nlohmann/json.hpp>
-- 
cgit v1.2.3