From 5798cedeafecc965244a8db7538d7e76c47eac84 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 10 Apr 2023 02:33:37 +0200 Subject: reduce precompiled header bitrot --- CMakeLists.txt | 2 +- anim-crop-tool/main.cpp | 1 - draw/CMakeLists.txt | 2 +- draw/precomp.hpp | 2 -- editor/precomp.hpp | 2 ++ main/precomp.hpp | 2 -- src/precomp.hpp | 28 +++++++++++----------------- 7 files changed, 15 insertions(+), 24 deletions(-) delete mode 100644 draw/precomp.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index ae1aaec9..b32e214e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -202,10 +202,10 @@ include_directories(SYSTEM ) #add_subdirectory(demangle) +add_subdirectory(src) add_subdirectory(main) add_subdirectory(draw) add_subdirectory(serialize) -add_subdirectory(src) add_subdirectory(editor) add_subdirectory(test) add_subdirectory(anim-crop-tool) diff --git a/anim-crop-tool/main.cpp b/anim-crop-tool/main.cpp index e7ccf582..57af2912 100644 --- a/anim-crop-tool/main.cpp +++ b/anim-crop-tool/main.cpp @@ -18,7 +18,6 @@ #include #include -#include #include #include diff --git a/draw/CMakeLists.txt b/draw/CMakeLists.txt index a4be3c13..843a6cc3 100644 --- a/draw/CMakeLists.txt +++ b/draw/CMakeLists.txt @@ -3,5 +3,5 @@ file(GLOB sources "*.cpp" CONFIGURE_ARGS) add_library(${self} OBJECT "${sources}") target_link_libraries(${self} PUBLIC Magnum::GL) if(FLOORMAT_PRECOMPILED-HEADERS) - target_precompile_headers(${self} PRIVATE precomp.hpp) + target_precompile_headers(${self} REUSE_FROM floormat) endif() diff --git a/draw/precomp.hpp b/draw/precomp.hpp deleted file mode 100644 index 0b357722..00000000 --- a/draw/precomp.hpp +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "../src/precomp.hpp" diff --git a/editor/precomp.hpp b/editor/precomp.hpp index 8949f3ed..1dca3bd8 100644 --- a/editor/precomp.hpp +++ b/editor/precomp.hpp @@ -1,6 +1,8 @@ #pragma once #include "src/precomp.hpp" +#include "entity/metadata.hpp" +#include "entity/accessor.hpp" #include #include diff --git a/main/precomp.hpp b/main/precomp.hpp index 68f78539..02f613db 100644 --- a/main/precomp.hpp +++ b/main/precomp.hpp @@ -1,8 +1,6 @@ #pragma once #include "src/precomp.hpp" -#include - #include #include #include diff --git a/src/precomp.hpp b/src/precomp.hpp index fe97f0a1..b4cf310a 100644 --- a/src/precomp.hpp +++ b/src/precomp.hpp @@ -5,26 +5,19 @@ #include "compat/defs.hpp" #include "compat/assert.hpp" +#if __has_include() +#include "compat/exception.hpp" +#endif + #ifdef __GNUG__ #pragma GCC system_header #endif -#include -#include -#include -#include -#include -#include -#include - #include -#include -#include #include #include - -#include #include +#include #include #include @@ -34,13 +27,14 @@ #include #include -#include #include -#include -#include +#include +#include + +#include +#include -#include -#include +#include #include #include -- cgit v1.2.3