diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2023-04-10 03:11:16 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2023-04-10 03:11:16 +0200 |
| commit | b567a0d4ceed1ce0bb184d9c3f712b2ec37f2a41 (patch) | |
| tree | b2fdf91f37b1b93f10f41d10e007c73e9d063096 | |
| parent | 6ebc64b4c61ea237f55438a4ebedf004648e65d7 (diff) | |
more precompiled header stuff
| -rw-r--r-- | editor/precomp.hpp | 15 | ||||
| -rw-r--r-- | main/precomp.hpp | 4 | ||||
| -rw-r--r-- | src/local-coords.hpp | 9 | ||||
| -rw-r--r-- | test/precomp.hpp | 2 | ||||
| -rw-r--r-- | userconfig-sthalik@Windows-Clang.cmake | 3 |
5 files changed, 25 insertions, 8 deletions
diff --git a/editor/precomp.hpp b/editor/precomp.hpp index 1dca3bd8..c0167163 100644 --- a/editor/precomp.hpp +++ b/editor/precomp.hpp @@ -4,14 +4,21 @@ #include "entity/metadata.hpp" #include "entity/accessor.hpp" +#include "src/entity.hpp" +#include "src/chunk.hpp" +#include "src/world.hpp" +#include "src/global-coords.hpp" +#include "src/anim-atlas.hpp" + +#include "app.hpp" +#include "imgui-raii.hpp" + #include <cstdlib> #include <map> -#include <fmt/format.h> -#include <fmt/compile.h> - +#include <Corrade/Containers/BitArrayView.h> #include <Corrade/Utility/Arguments.h> -#include <Magnum/ImGuiIntegration/Context.h> +#include <Magnum/ImGuiIntegration/Context.hpp> #if __has_include(<SDL.h>) #include <Magnum/Platform/Sdl2Application.h> diff --git a/main/precomp.hpp b/main/precomp.hpp index 02f613db..3f60a071 100644 --- a/main/precomp.hpp +++ b/main/precomp.hpp @@ -1,5 +1,9 @@ #pragma once #include "src/precomp.hpp" +#include "floormat/main.hpp" +#include "floormat/app.hpp" +#include "floormat/settings.hpp" +#include "main-impl.hpp" #include <Magnum/Timeline.h> #include <Magnum/GL/DebugOutput.h> diff --git a/src/local-coords.hpp b/src/local-coords.hpp index cb7a5c24..34aa09f1 100644 --- a/src/local-coords.hpp +++ b/src/local-coords.hpp @@ -1,9 +1,12 @@ #pragma once #include "compat/assert.hpp" #include "tile-defs.hpp" -#include <concepts> -#include <Magnum/Math/Vector2.h> -#include <Magnum/Math/Vector3.h> +#include <type_traits> + +namespace Magnum::Math { +template<class T> class Vector2; +template<class T> class Vector3; +} // namespace Magnum::Math namespace floormat { diff --git a/test/precomp.hpp b/test/precomp.hpp index c183dcc0..2e5871cd 100644 --- a/test/precomp.hpp +++ b/test/precomp.hpp @@ -1,7 +1,7 @@ #pragma once #include "../src/precomp.hpp" -#if 0 +#if 1 #ifdef __APPLE__ #include <Magnum/Platform/WindowlessCglApplication.h> #elif defined _WIN32 diff --git a/userconfig-sthalik@Windows-Clang.cmake b/userconfig-sthalik@Windows-Clang.cmake index 2ebcde43..f5b5818c 100644 --- a/userconfig-sthalik@Windows-Clang.cmake +++ b/userconfig-sthalik@Windows-Clang.cmake @@ -83,6 +83,9 @@ endfunction() # for test_app sources only function(fm-userconfig-src) + #add_compile_options(-ftime-trace) + #sets(BOOL FLOORMAT_PRECOMPILED-HEADERS ON) + add_compile_options( -Wall -Wextra -Wpedantic -Wno-old-style-cast -Wno-padded -Weverything ) |