From 32f03a8ea879115f1ac566a52a22efeded1e200d Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Fri, 8 May 2026 21:37:09 -0700
Subject: [PATCH] MSVC cleanup.

---
 vsprojects/core/core.vcxproj                    |  2 --
 vsprojects/core/packages.config                 |  1 -
 vsprojects/gui/gui.vcxproj                      |  2 --
 vsprojects/gui/packages.config                  |  1 -
 vsprojects/imgui-glfw-ogl3/packages.config      |  4 ----
 .../imgui-sdl3-ogl3.vcxproj}                    | 17 +++--------------
 .../imgui-sdl3-ogl3.vcxproj.filters}            | 15 ++++++---------
 vsprojects/mainthunk/mainthunk.vcxproj          |  4 +---
 vsprojects/mainthunk/packages.config            |  1 -
 vsprojects/pcsx-redux.sln                       |  2 +-
 vsprojects/tests/pcsxrunner/packages.config     |  1 -
 vsprojects/tests/pcsxrunner/pcsxrunner.vcxproj  |  4 +---
 12 files changed, 12 insertions(+), 42 deletions(-)
 delete mode 100644 vsprojects/imgui-glfw-ogl3/packages.config
 rename vsprojects/{imgui-glfw-ogl3/imgui-glfw-ogl3.vcxproj => imgui-sdl3-ogl3/imgui-sdl3-ogl3.vcxproj} (91%)
 rename vsprojects/{imgui-glfw-ogl3/imgui-glfw-ogl3.vcxproj.filters => imgui-sdl3-ogl3/imgui-sdl3-ogl3.vcxproj.filters} (97%)

diff --git a/vsprojects/core/core.vcxproj b/vsprojects/core/core.vcxproj
index 9cf1a2bc..2d6c0b99 100644
--- a/vsprojects/core/core.vcxproj
+++ b/vsprojects/core/core.vcxproj
@@ -237,14 +237,12 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\glfw.3.4.0\build\native\glfw.targets" Condition="Exists('..\packages\glfw.3.4.0\build\native\glfw.targets')" />
     <Import Project="..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets" Condition="Exists('..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\glfw.3.4.0\build\native\glfw.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\glfw.3.4.0\build\native\glfw.targets'))" />
     <Error Condition="!Exists('..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/vsprojects/core/packages.config b/vsprojects/core/packages.config
index 9dd9bcb8..08d3f42a 100644
--- a/vsprojects/core/packages.config
+++ b/vsprojects/core/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="glfw" version="3.4.0" targetFramework="native" />
   <package id="luajit.native" version="2.1.1739213504" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/vsprojects/gui/gui.vcxproj b/vsprojects/gui/gui.vcxproj
index 9b0b398e..1e587ad1 100644
--- a/vsprojects/gui/gui.vcxproj
+++ b/vsprojects/gui/gui.vcxproj
@@ -212,7 +212,6 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\glfw.3.4.0\build\native\glfw.targets" Condition="Exists('..\packages\glfw.3.4.0\build\native\glfw.targets')" />
     <Import Project="..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets" Condition="Exists('..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets')" />
     <Import Project="..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets" Condition="Exists('..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets')" />
   </ImportGroup>
@@ -220,7 +219,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\glfw.3.4.0\build\native\glfw.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\glfw.3.4.0\build\native\glfw.targets'))" />
     <Error Condition="!Exists('..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets'))" />
     <Error Condition="!Exists('..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets'))" />
   </Target>
diff --git a/vsprojects/gui/packages.config b/vsprojects/gui/packages.config
index 333f9653..c7a7d620 100644
--- a/vsprojects/gui/packages.config
+++ b/vsprojects/gui/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="glfw" version="3.4.0" targetFramework="native" />
   <package id="libFFmpeg-lite.lgpl2.native" version="5.1.3" targetFramework="native" />
   <package id="luajit.native" version="2.1.1739213504" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/vsprojects/imgui-glfw-ogl3/packages.config b/vsprojects/imgui-glfw-ogl3/packages.config
deleted file mode 100644
index 5f7ab861..00000000
--- a/vsprojects/imgui-glfw-ogl3/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="glfw" version="3.4.0" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/vsprojects/imgui-glfw-ogl3/imgui-glfw-ogl3.vcxproj b/vsprojects/imgui-sdl3-ogl3/imgui-sdl3-ogl3.vcxproj
similarity index 91%
rename from vsprojects/imgui-glfw-ogl3/imgui-glfw-ogl3.vcxproj
rename to vsprojects/imgui-sdl3-ogl3/imgui-sdl3-ogl3.vcxproj
index 9bde5385..06e6722e 100644
--- a/vsprojects/imgui-glfw-ogl3/imgui-glfw-ogl3.vcxproj
+++ b/vsprojects/imgui-sdl3-ogl3/imgui-sdl3-ogl3.vcxproj
@@ -141,8 +141,8 @@
   <ItemGroup>
     <ClCompile Include="..\..\third_party\gl3w\GL\gl3w-throwers.cc" />
     <ClCompile Include="..\..\third_party\gl3w\GL\gl3w.c" />
-    <ClCompile Include="..\..\third_party\imgui\backends\imgui_impl_glfw.cpp" />
     <ClCompile Include="..\..\third_party\imgui\backends\imgui_impl_opengl3.cpp" />
+    <ClCompile Include="..\..\third_party\imgui\backends\imgui_impl_sdl3.cpp" />
     <ClCompile Include="..\..\third_party\imgui\imgui.cpp" />
     <ClCompile Include="..\..\third_party\imgui\imgui_demo.cpp" />
     <ClCompile Include="..\..\third_party\imgui\imgui_draw.cpp" />
@@ -153,8 +153,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\third_party\gl3w\GL\gl3w-list.h" />
-    <ClInclude Include="..\..\third_party\imgui\backends\imgui_impl_glfw.h" />
     <ClInclude Include="..\..\third_party\imgui\backends\imgui_impl_opengl3.h" />
+    <ClInclude Include="..\..\third_party\imgui\backends\imgui_impl_sdl3.h" />
     <ClInclude Include="..\..\third_party\imgui\examples\libs\gl3w\GL\gl3w.h" />
     <ClInclude Include="..\..\third_party\imgui\examples\libs\gl3w\GL\glcorearb.h" />
     <ClInclude Include="..\..\third_party\imgui\imconfig.h" />
@@ -164,17 +164,6 @@
     <ClInclude Include="..\..\third_party\imgui\misc\cpp\imgui_stdlib.h" />
     <ClInclude Include="..\..\third_party\imgui\misc\freetype\imgui_freetype.h" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\glfw.3.4.0\build\native\glfw.targets" Condition="Exists('..\packages\glfw.3.4.0\build\native\glfw.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\glfw.3.4.0\build\native\glfw.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\glfw.3.4.0\build\native\glfw.targets'))" />
-  </Target>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>
\ No newline at end of file
diff --git a/vsprojects/imgui-glfw-ogl3/imgui-glfw-ogl3.vcxproj.filters b/vsprojects/imgui-sdl3-ogl3/imgui-sdl3-ogl3.vcxproj.filters
similarity index 97%
rename from vsprojects/imgui-glfw-ogl3/imgui-glfw-ogl3.vcxproj.filters
rename to vsprojects/imgui-sdl3-ogl3/imgui-sdl3-ogl3.vcxproj.filters
index aa8da0d1..783943fd 100644
--- a/vsprojects/imgui-glfw-ogl3/imgui-glfw-ogl3.vcxproj.filters
+++ b/vsprojects/imgui-sdl3-ogl3/imgui-sdl3-ogl3.vcxproj.filters
@@ -30,9 +30,6 @@
     <ClCompile Include="..\..\third_party\imgui\misc\cpp\imgui_stdlib.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\imgui\backends\imgui_impl_glfw.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\third_party\imgui\backends\imgui_impl_opengl3.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -48,6 +45,9 @@
     <ClCompile Include="..\..\third_party\gl3w\GL\gl3w-throwers.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\third_party\imgui\backends\imgui_impl_sdl3.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\third_party\imgui\imgui.h">
@@ -71,9 +71,6 @@
     <ClInclude Include="..\..\third_party\imgui\misc\cpp\imgui_stdlib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\third_party\imgui\backends\imgui_impl_glfw.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\third_party\imgui\backends\imgui_impl_opengl3.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -83,8 +80,8 @@
     <ClInclude Include="..\..\third_party\gl3w\GL\gl3w-list.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
+    <ClInclude Include="..\..\third_party\imgui\backends\imgui_impl_sdl3.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/vsprojects/mainthunk/mainthunk.vcxproj b/vsprojects/mainthunk/mainthunk.vcxproj
index a5401ce5..01833b5b 100644
--- a/vsprojects/mainthunk/mainthunk.vcxproj
+++ b/vsprojects/mainthunk/mainthunk.vcxproj
@@ -231,7 +231,7 @@
     <ProjectReference Include="..\ImFileDialog\ImFileDialog.vcxproj">
       <Project>{2bf92257-03c6-43fe-85e8-918166a07a26}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\imgui-glfw-ogl3\imgui-glfw-ogl3.vcxproj">
+    <ProjectReference Include="..\imgui-sdl3-ogl3\imgui-sdl3-ogl3.vcxproj">
       <Project>{b86f9380-6228-4b11-87ad-29fdabf95abb}</Project>
     </ProjectReference>
     <ProjectReference Include="..\imgui_lua_bindings\imgui_lua_bindings.vcxproj">
@@ -314,7 +314,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\packages\x64sentry-native.0.6.1\build\x64sentry-native.targets" Condition="Exists('..\packages\x64sentry-native.0.6.1\build\x64sentry-native.targets')" />
-    <Import Project="..\packages\glfw.3.4.0\build\native\glfw.targets" Condition="Exists('..\packages\glfw.3.4.0\build\native\glfw.targets')" />
     <Import Project="..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets" Condition="Exists('..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets')" />
     <Import Project="..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets" Condition="Exists('..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets')" />
   </ImportGroup>
@@ -323,7 +322,6 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\x64sentry-native.0.6.1\build\x64sentry-native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\x64sentry-native.0.6.1\build\x64sentry-native.targets'))" />
-    <Error Condition="!Exists('..\packages\glfw.3.4.0\build\native\glfw.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\glfw.3.4.0\build\native\glfw.targets'))" />
     <Error Condition="!Exists('..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets'))" />
     <Error Condition="!Exists('..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets'))" />
   </Target>
diff --git a/vsprojects/mainthunk/packages.config b/vsprojects/mainthunk/packages.config
index 94be7c9b..0d541c81 100644
--- a/vsprojects/mainthunk/packages.config
+++ b/vsprojects/mainthunk/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="glfw" version="3.4.0" targetFramework="native" />
   <package id="libFFmpeg-lite.lgpl2.native" version="5.1.3" targetFramework="native" />
   <package id="luajit.native" version="2.1.1739213504" targetFramework="native" />
   <package id="x64sentry-native" version="0.6.1" targetFramework="native" />
diff --git a/vsprojects/pcsx-redux.sln b/vsprojects/pcsx-redux.sln
index 8aa9a3cc..0b9a099c 100644
--- a/vsprojects/pcsx-redux.sln
+++ b/vsprojects/pcsx-redux.sln
@@ -25,7 +25,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GPU", "GPU", "{60F01E36-B838-4AA0-8057-8324E0E39526}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imgui-glfw-ogl3", "imgui-glfw-ogl3\imgui-glfw-ogl3.vcxproj", "{B86F9380-6228-4B11-87AD-29FDABF95ABB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imgui-sdl3-ogl3", "imgui-sdl3-ogl3\imgui-sdl3-ogl3.vcxproj", "{B86F9380-6228-4B11-87AD-29FDABF95ABB}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gui", "gui\gui.vcxproj", "{6EC7FDF3-1418-40BD-8584-1EEA34AC3E3E}"
 EndProject
diff --git a/vsprojects/tests/pcsxrunner/packages.config b/vsprojects/tests/pcsxrunner/packages.config
index 333f9653..c7a7d620 100644
--- a/vsprojects/tests/pcsxrunner/packages.config
+++ b/vsprojects/tests/pcsxrunner/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="glfw" version="3.4.0" targetFramework="native" />
   <package id="libFFmpeg-lite.lgpl2.native" version="5.1.3" targetFramework="native" />
   <package id="luajit.native" version="2.1.1739213504" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/vsprojects/tests/pcsxrunner/pcsxrunner.vcxproj b/vsprojects/tests/pcsxrunner/pcsxrunner.vcxproj
index eb0b3104..5e9a3e1e 100644
--- a/vsprojects/tests/pcsxrunner/pcsxrunner.vcxproj
+++ b/vsprojects/tests/pcsxrunner/pcsxrunner.vcxproj
@@ -182,7 +182,7 @@
     <ProjectReference Include="..\..\ImFileDialog\ImFileDialog.vcxproj">
       <Project>{2bf92257-03c6-43fe-85e8-918166a07a26}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\imgui-glfw-ogl3\imgui-glfw-ogl3.vcxproj">
+    <ProjectReference Include="..\..\imgui-sdl3-ogl3\imgui-sdl3-ogl3.vcxproj">
       <Project>{b86f9380-6228-4b11-87ad-29fdabf95abb}</Project>
     </ProjectReference>
     <ProjectReference Include="..\..\imgui_lua_bindings\imgui_lua_bindings.vcxproj">
@@ -272,7 +272,6 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\packages\glfw.3.4.0\build\native\glfw.targets" Condition="Exists('..\..\packages\glfw.3.4.0\build\native\glfw.targets')" />
     <Import Project="..\..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets" Condition="Exists('..\..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets')" />
     <Import Project="..\..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets" Condition="Exists('..\..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets')" />
   </ImportGroup>
@@ -280,7 +279,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\glfw.3.4.0\build\native\glfw.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\glfw.3.4.0\build\native\glfw.targets'))" />
     <Error Condition="!Exists('..\..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\libFFmpeg-lite.lgpl2.native.5.1.3\build\native\libffmpeg-lite.lgpl2.native.targets'))" />
     <Error Condition="!Exists('..\..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\luajit.native.2.1.1739213504\build\native\luajit.native.targets'))" />
   </Target>