From 57b50fb3c629e024f6cfa202ba9c6eef37856f1c Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 22 Oct 2022 17:07:14 +0200 Subject: disable more imgui obsolete stuff --- CMakeLists.txt | 5 +++++ external/CMakeLists.txt | 4 ++++ main/CMakeLists.txt | 1 - 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94e56c5e..a9810a0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,6 +112,11 @@ else() add_definitions(-include compat/prelude.hpp) endif() +add_definitions( + -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS + -DIMGUI_DISABLE_OBSOLETE_KEYIO +) + fm_run_hook(fm-userconfig-src) include_directories(.) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index c7ed3725..8f5632d1 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -31,6 +31,10 @@ else() endif() if(FLOORMAT_SUBMODULE-DEPENDENCIES) + add_definitions( + -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS + -DIMGUI_DISABLE_OBSOLETE_KEYIO + ) sets(STRING SDL_INSTALL_CMAKEDIR "share/cmake/SDL2" NLOHMANN_JSON_CONFIG_INSTALL_DIR "share/cmake/nlohmann_json" diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 389da970..9780ad4c 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -1,7 +1,6 @@ set(self "${PROJECT_NAME}-main") file(GLOB sources "*.cpp" CONFIGURE_ARGS) -add_definitions(-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS) link_libraries(${PROJECT_NAME} ${PROJECT_NAME}-draw) link_libraries(Magnum::Sdl2Application Magnum::Trade) link_libraries(MagnumIntegration::ImGui) -- cgit v1.2.3