From da29c340c78fb71e5e19cdfdea5979f0f9acca9b Mon Sep 17 00:00:00 2001
From: Jeremy Rose <nornagon@nornagon.net>
Date: Fri, 1 Mar 2024 19:37:10 -0800
Subject: [PATCH 1/4] build with -DIMGUI_DISABLE_OBSOLETE_KEYIO

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 79a6a6b331fe6..6d5ca452a576b 100644
--- a/Makefile
+++ b/Makefile
@@ -955,6 +955,7 @@ SOURCES += $(THIRD_PARTY_SOURCES)
 
 IMGUI_SOURCES = $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_tables.cpp $(IMGUI_DIR)/imgui_widgets.cpp
 
+OTHERS += -DIMGUI_DISABLE_OBSOLETE_KEYIO
 ifeq ($(SDL), 1)
 	IMGUI_SOURCES += $(IMGUI_DIR)/imgui_impl_sdl2.cpp $(IMGUI_DIR)/imgui_impl_sdlrenderer2.cpp
 else

From bf9bea13862b31a7f64af1181040cedbd592d761 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <nornagon@nornagon.net>
Date: Sat, 2 Mar 2024 14:17:20 -0800
Subject: [PATCH 2/4] Update Makefile

Co-authored-by: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6d5ca452a576b..c2390e04882ba 100644
--- a/Makefile
+++ b/Makefile
@@ -955,8 +955,8 @@ SOURCES += $(THIRD_PARTY_SOURCES)
 
 IMGUI_SOURCES = $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_tables.cpp $(IMGUI_DIR)/imgui_widgets.cpp
 
-OTHERS += -DIMGUI_DISABLE_OBSOLETE_KEYIO
 ifeq ($(SDL), 1)
+	OTHERS += -DIMGUI_DISABLE_OBSOLETE_KEYIO
 	IMGUI_SOURCES += $(IMGUI_DIR)/imgui_impl_sdl2.cpp $(IMGUI_DIR)/imgui_impl_sdlrenderer2.cpp
 else
 	IMGUI_SOURCES += $(IMTUI_DIR)/imtui-impl-ncurses.cpp $(IMTUI_DIR)/imtui-impl-text.cpp

From 71d53fcf9f79e907cf9fac188b2ea926ba460ef3 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <nornagon@nornagon.net>
Date: Sat, 2 Mar 2024 14:27:59 -0800
Subject: [PATCH 3/4] also cmake

---
 src/third-party/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/third-party/CMakeLists.txt b/src/third-party/CMakeLists.txt
index 47f253d903202..f44d9f01880ce 100644
--- a/src/third-party/CMakeLists.txt
+++ b/src/third-party/CMakeLists.txt
@@ -102,6 +102,9 @@ if (TILES)
                 PRIVATE
                 -w
                 )
+
+        add_definitions(-DIMGUI_DISABLE_OBSOLETE_KEYIO)
+
         if (NOT DYNAMIC_LINKING)
             target_link_libraries(imgui PUBLIC
                 SDL2::SDL2-static

From 0791652e9b343c8457c3ba49217feaf8acb571cd Mon Sep 17 00:00:00 2001
From: Jeremy Rose <nornagon@nornagon.net>
Date: Thu, 7 Mar 2024 21:31:53 -0800
Subject: [PATCH 4/4] Update Cataclysm-common.props

---
 msvc-full-features/Cataclysm-common.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msvc-full-features/Cataclysm-common.props b/msvc-full-features/Cataclysm-common.props
index 832e0c55d5e3d..abf9ac68d6c9c 100644
--- a/msvc-full-features/Cataclysm-common.props
+++ b/msvc-full-features/Cataclysm-common.props
@@ -55,7 +55,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <ForcedIncludeFiles>$(MSBuildThisFileDirectory)..\pch\main-pch.hpp</ForcedIncludeFiles>
       <DisableSpecificWarnings>4661;4819;4146;26495;26444;26451;4068;6319;6237</DisableSpecificWarnings>
-      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;LOCALIZE;USE_VCPKG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;LOCALIZE;USE_VCPKG;IMGUI_DISABLE_OBSOLETE_KEYIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>$(MSBuildThisFileDirectory)..\pch\main-pch.hpp</PrecompiledHeaderFile>
     </ClCompile>