diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | anim-crop-tool/main.cpp | 1 | ||||
| -rw-r--r-- | draw/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | draw/precomp.hpp | 2 | ||||
| -rw-r--r-- | editor/precomp.hpp | 2 | ||||
| -rw-r--r-- | main/precomp.hpp | 2 | ||||
| -rw-r--r-- | src/precomp.hpp | 28 |
7 files changed, 15 insertions, 24 deletions
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 <Corrade/Containers/String.h> #include <Corrade/Utility/Arguments.h> -#include <Corrade/Utility/Debug.h> #include <Corrade/Utility/DebugStl.h> #include <Corrade/Utility/Path.h> 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 <cstdlib> #include <map> 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 <Corrade/Utility/DebugStl.h> - #include <Magnum/Timeline.h> #include <Magnum/GL/DebugOutput.h> #include <Magnum/GL/DefaultFramebuffer.h> 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(<fmt/core.h>) +#include "compat/exception.hpp" +#endif + #ifdef __GNUG__ #pragma GCC system_header #endif -#include <bit> -#include <cerrno> -#include <cstddef> -#include <cstdint> -#include <cstring> -#include <cmath> -#include <cstdio> - #include <concepts> -#include <iterator> -#include <limits> #include <memory> #include <type_traits> - -#include <algorithm> #include <utility> +#include <algorithm> #include <tuple> #include <bitset> @@ -34,13 +27,14 @@ #include <Corrade/Containers/Array.h> #include <Corrade/Containers/ArrayViewStl.h> -#include <Corrade/Containers/EnumSet.h> #include <Corrade/Containers/Pointer.h> -#include <Corrade/Containers/StringStl.h> -#include <Corrade/Containers/StringStlHash.h> +#include <Corrade/Containers/String.h> +#include <Corrade/Containers/StringView.h> + +#include <Corrade/Containers/PairStl.h> +#include <Corrade/Containers/TripleStl.h> -#include <Corrade/Utility/DebugStl.h> -#include <Corrade/Utility/Resource.h> +#include <Corrade/Utility/Debug.h> #include <Corrade/Utility/Path.h> #include <Magnum/Magnum.h> |