From 50bddb29135723b6b2a825302d239ebf8ed7fb9f Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 10 Nov 2022 11:40:50 +0100
Subject: random garbage

---
 CMakeLists.txt     |  1 +
 compat/prelude.hpp |  2 ++
 editor/app.cpp     |  2 +-
 editor/precomp.hpp | 10 ++++++++--
 external/imgui     |  2 +-
 main/precomp.hpp   |  4 +++-
 src/precomp.hpp    | 10 ++++++----
 7 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1591916..7e1b8117 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ set(CMAKE_C_EXTENSIONS FALSE)
 
 set(CMAKE_C_VISIBILITY_PRESET hidden)
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
 set(CMAKE_C_LINKER_PREFERENCE_PROPAGATES OFF)
 set(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
diff --git a/compat/prelude.hpp b/compat/prelude.hpp
index f953a2b3..c0c3a40c 100644
--- a/compat/prelude.hpp
+++ b/compat/prelude.hpp
@@ -1,8 +1,10 @@
 #pragma once
 
+namespace Corrade::Containers::Literals {}
 namespace Corrade::Containers {}
 namespace Magnum {}
 namespace floormat {
     using namespace ::Magnum;
     using namespace ::Corrade::Containers;
+    using namespace ::Corrade::Containers::Literals;
 } // namespace floormat
diff --git a/editor/app.cpp b/editor/app.cpp
index a2c8b104..1795acc3 100644
--- a/editor/app.cpp
+++ b/editor/app.cpp
@@ -62,7 +62,7 @@ int app::run_from_argv(const int argc, const char* const* const argv)
         .parse(argc, argv);
     opts.vsync = parse_bool("vsync", args, opts.vsync);
     opts.msaa  = parse_bool("msaa", args, opts.msaa);
-    if (auto str = args.value<StringView>("gpu-debug"); str == "no-error" || str == "NO-ERROR")
+    if (auto str = args.value<StringView>("gpu-debug"); str == "no-error" || str == "NO-ERROR" || str == "none")
         opts.gpu_debug = fm_gpu_debug::no_error;
     else if (str == "robust" || str == "ROBUST")
         opts.gpu_debug = fm_gpu_debug::robust;
diff --git a/editor/precomp.hpp b/editor/precomp.hpp
index 93ff8164..27d0f317 100644
--- a/editor/precomp.hpp
+++ b/editor/precomp.hpp
@@ -1,14 +1,20 @@
 #pragma once
 
 #include "src/precomp.hpp"
+
 #include <cstdlib>
+#include <map>
+
+#include <fmt/format.h>
+#include <fmt/compile.h>
 
 #include <Corrade/Utility/Arguments.h>
 
-#include <Magnum/Math/Color.h>
-#include <Magnum/GL/DebugOutput.h>
 #include <Magnum/GL/Renderer.h>
 #include <Magnum/ImGuiIntegration/Context.h>
+
 #if __has_include(<SDL.h>)
 #include <Magnum/Platform/Sdl2Application.h>
+#include <SDL_keycode.h>
+#include <SDL_events.h>
 #endif
diff --git a/external/imgui b/external/imgui
index ebe32273..7380b981 160000
--- a/external/imgui
+++ b/external/imgui
@@ -1 +1 @@
-Subproject commit ebe322733eb80be1b57d0d08ed5fe0d040b8f708
+Subproject commit 7380b9816e6aa0cb443de928a3b4ec92ac2386ff
diff --git a/main/precomp.hpp b/main/precomp.hpp
index 8940421a..68f78539 100644
--- a/main/precomp.hpp
+++ b/main/precomp.hpp
@@ -3,7 +3,6 @@
 
 #include <Corrade/Utility/DebugStl.h>
 
-#include <Magnum/Math/Vector2.h>
 #include <Magnum/Timeline.h>
 #include <Magnum/GL/DebugOutput.h>
 #include <Magnum/GL/DefaultFramebuffer.h>
@@ -11,6 +10,9 @@
 #include <Magnum/GL/Renderbuffer.h>
 #include <Magnum/GL/RenderbufferFormat.h>
 
+#include <fmt/format.h>
+#include <fmt/compile.h>
+
 #if __has_include(<SDL.h>)
 #include <Magnum/Platform/Sdl2Application.h>
 #include <SDL_keycode.h>
diff --git a/src/precomp.hpp b/src/precomp.hpp
index 8275bc81..856d45fe 100644
--- a/src/precomp.hpp
+++ b/src/precomp.hpp
@@ -16,13 +16,13 @@
 #include <cmath>
 
 #include <concepts>
+#include <iterator>
 #include <limits>
 #include <memory>
 #include <type_traits>
 
 #include <algorithm>
 #include <utility>
-#include <iterator>
 #include <filesystem>
 
 #include <tuple>
@@ -30,12 +30,14 @@
 #include <optional>
 #include <vector>
 #include <unordered_map>
+#include <string>
 
 #include <Corrade/Containers/Array.h>
-#include <Corrade/Containers/ArrayViewStl.h> // TODO maybe remove stl
-#include <Corrade/Containers/StringStlView.h> // TODO remove stl
-#include <Corrade/Containers/String.h>
+#include <Corrade/Containers/ArrayView.h>
+#include <Corrade/Containers/StringView.h>
 #include <Corrade/Containers/Pointer.h>
+#include <Corrade/Containers/ArrayViewStl.h> // TODO maybe remove stl
+#include <Corrade/Containers/StringStl.h> // TODO remove stl
 #include <Corrade/Utility/DebugStl.h>
 
 #include <Magnum/Magnum.h>
-- 
cgit v1.2.3