diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2023-04-10 08:52:32 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2023-04-10 10:35:00 +0200 |
| commit | fdcff54e1d845343cdfe39040aac6f7ff9b4163a (patch) | |
| tree | db8de10a96b8022f43761c74a2d58453e3380d93 /main | |
| parent | 8c867fac69fa9da0370000fa170cad1e22702ce5 (diff) | |
cmake: remove precompiled headers
They were having problems including fmtlib and robin_map.
Diffstat (limited to 'main')
| -rw-r--r-- | main/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | main/precomp.hpp | 22 |
2 files changed, 1 insertions, 35 deletions
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 50e1bc91..fe32d1d5 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -8,17 +8,5 @@ target_link_libraries(${self} PUBLIC Magnum::GL Magnum::Trade fmt::fmt + tsl::robin_map ) - -if(NOT SDL2_INCLUDE_DIRS) - if(NOT TARGET SDL2::SDL2) - find_package(SDL2 QUIET REQUIRED) - else() - get_target_property(SDL2_INCLUDE_DIRS SDL2::SDL2 INTERFACE_INCLUDE_DIRECTORIES) - endif() -endif() -include_directories("${SDL2_INCLUDE_DIRS}") - -if(FLOORMAT_PRECOMPILED-HEADERS) - target_precompile_headers(${self} PRIVATE precomp.hpp) -endif() diff --git a/main/precomp.hpp b/main/precomp.hpp deleted file mode 100644 index 3f60a071..00000000 --- a/main/precomp.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#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> -#include <Magnum/GL/DefaultFramebuffer.h> -#include <Magnum/GL/Framebuffer.h> -#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> -#include <SDL_events.h> -#endif |