diff options
| -rw-r--r-- | .github/workflows/cmake-tag.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/cmake.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | draw/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | editor/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | loader/loader.hpp | 4 | ||||
| -rw-r--r-- | main/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | serialize/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | shaders/texture-unit-cache.cpp | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/precomp.hpp | 72 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | userconfig-runner@Darwin-Clang.cmake | 1 | ||||
| -rw-r--r-- | userconfig-runner@Linux-GNU.cmake | 1 | ||||
| -rw-r--r-- | userconfig-sthalik@Windows-Clang.cmake | 6 | ||||
| -rw-r--r-- | userconfig-sthalik@Windows-MSVC.cmake | 1 |
16 files changed, 8 insertions, 116 deletions
diff --git a/.github/workflows/cmake-tag.yml b/.github/workflows/cmake-tag.yml index e3789e50..1f74515a 100644 --- a/.github/workflows/cmake-tag.yml +++ b/.github/workflows/cmake-tag.yml @@ -48,7 +48,7 @@ jobs: if: matrix.os == 'macos-12' - name: Configure - run: ${{matrix.cmake}} -G "Ninja" -S ${{github.workspace}}/ -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DFLOORMAT_PRECOMPILED-HEADERS:BOOL=OFF + run: ${{matrix.cmake}} -G "Ninja" -S ${{github.workspace}}/ -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - name: Build run: ${{matrix.cmake}} --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target install diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index a66d263c..d9690313 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -49,7 +49,7 @@ jobs: if: matrix.os == 'macos-12' - name: Configure - run: ${{matrix.cmake}} -G "Ninja" -S ${{github.workspace}}/ -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DFLOORMAT_PRECOMPILED-HEADERS:BOOL=OFF + run: ${{matrix.cmake}} -G "Ninja" -S ${{github.workspace}}/ -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - name: Build run: ${{matrix.cmake}} --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target install diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c87871d..c84031cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,7 +181,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang$") add_definitions(-D_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) add_compile_options(-Wno-shift-op-parentheses) elseif(CMAKE_COMPILER_IS_GNUCXX) - add_compile_options(-Wno-subobject-linkage -Wno-parentheses) + add_compile_options(-Wno-subobject-linkage -Wno-parentheses -Wno-overloaded-virtual) endif() include_directories(.) diff --git a/draw/CMakeLists.txt b/draw/CMakeLists.txt index f12604ab..2c12289d 100644 --- a/draw/CMakeLists.txt +++ b/draw/CMakeLists.txt @@ -2,9 +2,3 @@ set(self floormat-draw) file(GLOB sources "*.cpp" CONFIGURE_ARGS) add_library(${self} OBJECT "${sources}") target_link_libraries(${self} PUBLIC Magnum::GL) - -if(NOT MSVC) - target_precompile_headers(${self} REUSE_FROM floormat) -else() - target_precompile_headers(${self} PRIVATE ../src/precomp.hpp) -endif() diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt index 97abd54d..e53e36d8 100644 --- a/editor/CMakeLists.txt +++ b/editor/CMakeLists.txt @@ -32,9 +32,3 @@ endif() target_link_libraries(${self} PRIVATE ${self}_o floormat-main floormat-serialize floormat-draw floormat) install(TARGETS ${self} RUNTIME DESTINATION bin) - -if(NOT MSVC) - target_precompile_headers(${self}_o REUSE_FROM floormat) -else() - target_precompile_headers(${self}_o PRIVATE ../src/precomp.hpp) -endif() diff --git a/loader/loader.hpp b/loader/loader.hpp index 937ef828..484c5102 100644 --- a/loader/loader.hpp +++ b/loader/loader.hpp @@ -4,6 +4,10 @@ #include <vector> #include <Corrade/Containers/StringView.h> +#if defined _WIN32 && !defined FILENAME_MAX +#define FILENAME_MAX 260 +#endif + namespace Magnum { using Vector2ub = Math::Vector2<unsigned char>; } namespace floormat { struct serialized_scenery; } namespace Magnum::Trade { diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 419043aa..fe32d1d5 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -10,9 +10,3 @@ target_link_libraries(${self} PUBLIC fmt::fmt tsl::robin_map ) - -if(NOT MSVC) - target_precompile_headers(${self} REUSE_FROM floormat) -else() - target_precompile_headers(${self} PRIVATE ../src/precomp.hpp) -endif() diff --git a/serialize/CMakeLists.txt b/serialize/CMakeLists.txt index cee8ac42..f1db2bbf 100644 --- a/serialize/CMakeLists.txt +++ b/serialize/CMakeLists.txt @@ -25,9 +25,3 @@ endif() if(WIN32) target_link_libraries(${self} PUBLIC ntdll) endif() - -if(NOT MSVC) - target_precompile_headers(${self} REUSE_FROM floormat) -else() - target_precompile_headers(${self} PRIVATE ../src/precomp.hpp) -endif() diff --git a/shaders/texture-unit-cache.cpp b/shaders/texture-unit-cache.cpp index 918ee56c..4c261b41 100644 --- a/shaders/texture-unit-cache.cpp +++ b/shaders/texture-unit-cache.cpp @@ -1,6 +1,7 @@ #include "texture-unit-cache.hpp" #include "compat/assert.hpp" +#include <Corrade/Containers/String.h> #include <Magnum/GL/Texture.h> namespace floormat { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4f292847..f8d3e032 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -10,5 +10,3 @@ target_link_libraries( fmt::fmt tsl::robin_map ) - -target_precompile_headers(${self} PRIVATE precomp.hpp) diff --git a/src/precomp.hpp b/src/precomp.hpp deleted file mode 100644 index 201e671c..00000000 --- a/src/precomp.hpp +++ /dev/null @@ -1,72 +0,0 @@ -#if 1 -#include <algorithm> -#include <array> -#include <bit> -#include <cerrno> -#include <chrono> -#include <cmath> -#include <concepts> -#include <cstddef> -#include <cstdio> -#include <cstdlib> -#include <cstring> -#include <exception> -#include <iterator> -#include <limits> -#include <map> -#include <memory> -#include <stdlib.h> -#include <string> -#include <tuple> -#include <type_traits> -#include <unordered_map> -#include <utility> -#include <vector> - -#if __has_include(<external/robin-map/include/tsl/robin_map.h>) -#include <external/robin-map/include/tsl/robin_map.h> -#elif __has_include(<tsl/robin_map.h>) -#include <tsl/robin_map.h> -#endif - -#include <Corrade/Containers/Array.h> -#include <Corrade/Containers/ArrayView.h> -#include <Corrade/Containers/ArrayViewStl.h> -#include <Corrade/Containers/BitArrayView.h> -#include <Corrade/Containers/Optional.h> -#include <Corrade/Containers/Pair.h> -#include <Corrade/Containers/PairStl.h> -#include <Corrade/Containers/StridedArrayView.h> -#include <Corrade/Containers/String.h> -#include <Corrade/Containers/StringIterable.h> -#include <Corrade/Containers/StringStlView.h> -#include <Corrade/Containers/StringView.h> -#include <Corrade/Utility/Debug.h> -#include <Corrade/Utility/Path.h> - -#include <Magnum/GL/Buffer.h> -#include <Magnum/GL/Context.h> -#include <Magnum/GL/Mesh.h> -#include <Magnum/GL/MeshView.h> -#include <Magnum/GL/Renderer.h> -#include <Magnum/GL/Texture.h> -#include <Magnum/GL/TextureFormat.h> -#include <Magnum/ImageView.h> -#include <Magnum/Magnum.h> -#include <Magnum/Math/Color.h> -#include <Magnum/Math/Range.h> -#include <Magnum/Math/Vector.h> -#include <Magnum/Math/Vector2.h> -#include <Magnum/Math/Vector3.h> -#include <Magnum/Math/Vector4.h> -#include <Magnum/PixelFormat.h> -#include <Magnum/Trade/ImageData.h> - -#include "compat/prelude.hpp" -#include "compat/defs.hpp" -#include "compat/assert.hpp" -#include "compat/function2.hpp" -#include "src/global-coords.hpp" -#include "src/anim-atlas.hpp" - -#endif diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 3ae516bb..0d713de5 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -30,9 +30,3 @@ file(GLOB saves "save/*.dat" CONFIGURE_ARGS) foreach(file ${saves}) configure_file("${file}" "${save-dir}" COPYONLY) endforeach() - -if(NOT MSVC) - target_precompile_headers(${self}_o REUSE_FROM floormat) -else() - target_precompile_headers(${self}_o PRIVATE ../src/precomp.hpp) -endif() diff --git a/userconfig-runner@Darwin-Clang.cmake b/userconfig-runner@Darwin-Clang.cmake index 1843302d..a5b8250f 100644 --- a/userconfig-runner@Darwin-Clang.cmake +++ b/userconfig-runner@Darwin-Clang.cmake @@ -1,4 +1,3 @@ -sets(BOOL FLOORMAT_PRECOMPILED-HEADERS OFF) sets(BOOL FLOORMAT_SUBMODULE-SDL2 OFF) set(CMAKE_INSTALL_MESSAGE NEVER) sets(STRING diff --git a/userconfig-runner@Linux-GNU.cmake b/userconfig-runner@Linux-GNU.cmake index b5b6aba9..41075d75 100644 --- a/userconfig-runner@Linux-GNU.cmake +++ b/userconfig-runner@Linux-GNU.cmake @@ -1,4 +1,3 @@ -sets(BOOL FLOORMAT_PRECOMPILED-HEADERS OFF) sets(BOOL FLOORMAT_SUBMODULE-SDL2 OFF) set(CMAKE_INSTALL_MESSAGE NEVER) sets(STRING diff --git a/userconfig-sthalik@Windows-Clang.cmake b/userconfig-sthalik@Windows-Clang.cmake index 244ebffc..bb5b6103 100644 --- a/userconfig-sthalik@Windows-Clang.cmake +++ b/userconfig-sthalik@Windows-Clang.cmake @@ -12,22 +12,17 @@ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -fcoverage-mapping ) endif() - #sets(BOOL FLOORMAT_PRECOMPILED-HEADERS OFF) else() add_compile_options(-march=native -mavx2) add_compile_options(-emit-llvm) add_compile_options(-fmerge-all-constants -flto=full -fwhole-program-vtables -fforce-emit-vtables) add_link_options(-fmerge-all-constants -flto=full -fwhole-program-vtables -fforce-emit-vtables) add_link_options(-Wl,--gc-sections -Wl,--icf=all) - #sets(BOOL FLOORMAT_PRECOMPILED-HEADERS ON) endif() -sets(BOOL FLOORMAT_PRECOMPILED-HEADERS OFF) - if(FLOORMAT_ASAN) add_compile_options(-fsanitize=undefined -fsanitize=address) add_link_options(-fsanitize=undefined -fsanitize=address) - sets(BOOL FLOORMAT_PRECOMPILED-HEADERS ON) endif() set(OpenCV_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../opentrack-depends/opencv/build-clang-amd64/install" CACHE PATH "" FORCE) @@ -88,7 +83,6 @@ 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 diff --git a/userconfig-sthalik@Windows-MSVC.cmake b/userconfig-sthalik@Windows-MSVC.cmake index ba0ca07d..d7777ad9 100644 --- a/userconfig-sthalik@Windows-MSVC.cmake +++ b/userconfig-sthalik@Windows-MSVC.cmake @@ -10,7 +10,6 @@ list(APPEND CMAKE_IGNORE_PREFIX_PATH "c:/msys64") set(CMAKE_INSTALL_MESSAGE NEVER) sets(PATH CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install") -sets(BOOL FLOORMAT_PRECOMPILED-HEADERS OFF) sets(BOOL FLOORMAT_SUBMODULE-SDL2 ON) add_link_options(-STACK:41943040) |