diff --git a/Externals/FatFs/FatFs.vcxproj b/Externals/FatFs/FatFs.vcxproj index 659f66083b..9d30dd67f7 100644 --- a/Externals/FatFs/FatFs.vcxproj +++ b/Externals/FatFs/FatFs.vcxproj @@ -30,4 +30,4 @@ - + \ No newline at end of file diff --git a/Externals/SDL/SDL3.vcxproj b/Externals/SDL/SDL3.vcxproj index 63e0f81b8a..df99fd8457 100644 --- a/Externals/SDL/SDL3.vcxproj +++ b/Externals/SDL/SDL3.vcxproj @@ -512,4 +512,4 @@ - + \ No newline at end of file diff --git a/Externals/SFML/SFML.vcxproj b/Externals/SFML/SFML.vcxproj index 072677f948..3552a1f429 100644 --- a/Externals/SFML/SFML.vcxproj +++ b/Externals/SFML/SFML.vcxproj @@ -1,67 +1,65 @@ - - - - {93D73454-2512-424E-9CDA-4BB357FE13DD} - - - - - - - - - - - - - - SFML\include;SFML\src;%(AdditionalIncludeDirectories) - SFML_STATIC;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + {93D73454-2512-424E-9CDA-4BB357FE13DD} + + + + + + + + + + + + + + SFML\include;SFML\src;%(AdditionalIncludeDirectories) + SFML_STATIC;%(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Externals/cpp-ipc/cpp-ipc.vcxproj b/Externals/cpp-ipc/cpp-ipc.vcxproj index 61dc5eda6e..886f0061da 100644 --- a/Externals/cpp-ipc/cpp-ipc.vcxproj +++ b/Externals/cpp-ipc/cpp-ipc.vcxproj @@ -75,4 +75,4 @@ - + \ No newline at end of file diff --git a/Externals/cubeb/msvc/cubeb.vcxproj.filters b/Externals/cubeb/msvc/cubeb.vcxproj.filters index fd366dbb06..3050421803 100644 --- a/Externals/cubeb/msvc/cubeb.vcxproj.filters +++ b/Externals/cubeb/msvc/cubeb.vcxproj.filters @@ -6,7 +6,6 @@ - @@ -18,45 +17,34 @@ - - speex - - - speex - - - speex - - - speex - - - speex - - - speex - - - speex - + + + + + + + + + + + + - - - speex - + + {caf7c7d0-0918-4299-8423-b287285d6fd0} - + \ No newline at end of file diff --git a/Externals/curl/curl.vcxproj b/Externals/curl/curl.vcxproj index 553c446bda..472f06c371 100644 --- a/Externals/curl/curl.vcxproj +++ b/Externals/curl/curl.vcxproj @@ -387,4 +387,4 @@ - + \ No newline at end of file diff --git a/Externals/discord-rpc/src/discord-rpc.vcxproj b/Externals/discord-rpc/src/discord-rpc.vcxproj index a3f1b38e7f..29bf4426b5 100644 --- a/Externals/discord-rpc/src/discord-rpc.vcxproj +++ b/Externals/discord-rpc/src/discord-rpc.vcxproj @@ -41,4 +41,4 @@ - + \ No newline at end of file diff --git a/Externals/glslang/glslang.vcxproj b/Externals/glslang/glslang.vcxproj index 6ead065932..1e139e75ed 100644 --- a/Externals/glslang/glslang.vcxproj +++ b/Externals/glslang/glslang.vcxproj @@ -30,7 +30,7 @@ "Visual Studio $(VisualStudioVersion.Substring(0,2))" amd64 - arm64 + arm64 call vsdevcmd.bat -arch=$(DevCmdArch) cmake -G $(CmakeGenerator) -A $(Platform) -DCMAKE_BUILD_TYPE="Release" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DGLSLANG_TESTS=OFF -DENABLE_GLSLANG_BINARIES=OFF -DBUILD_EXTERNAL=OFF -DENABLE_SPVREMAPPER=OFF -DENABLE_HLSL=OFF -DENABLE_OPT=OFF -DENABLE_EXCEPTIONS=OFF -S glslang -B "$(BuildRootDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)" @@ -94,4 +94,4 @@ - + \ No newline at end of file diff --git a/Externals/implot/implot.vcxproj b/Externals/implot/implot.vcxproj index 11446581c6..bacc02cebb 100644 --- a/Externals/implot/implot.vcxproj +++ b/Externals/implot/implot.vcxproj @@ -1,37 +1,37 @@  - - - - {A608225E-AE0A-4D1A-9B55-97F57C862391} - - - - - - - - - - - - - - - $(CoreDir);%(AdditionalIncludeDirectories) - - - - - - - - - - - - - - - - + + + + {A608225E-AE0A-4D1A-9B55-97F57C862391} + + + + + + + + + + + + + + + $(CoreDir);%(AdditionalIncludeDirectories) + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Externals/mGBA/mgba.vcxproj.filters b/Externals/mGBA/mgba.vcxproj.filters index f3080a18e7..ae2eaa6d92 100644 --- a/Externals/mGBA/mgba.vcxproj.filters +++ b/Externals/mGBA/mgba.vcxproj.filters @@ -283,7 +283,16 @@ Source Files - + + Source Files + + + Source Files + + + Source Files + + Source Files @@ -298,9 +307,6 @@ Source Files - - Source Files - Source Files @@ -427,6 +433,9 @@ Source Files + + Source Files + Source Files @@ -448,4 +457,4 @@ {37E5D4D5-B263-3B94-8968-21228F26DF67} - + \ No newline at end of file diff --git a/Externals/tinygltf/tinygltf.vcxproj b/Externals/tinygltf/tinygltf.vcxproj index e33d949e56..5d83b23607 100644 --- a/Externals/tinygltf/tinygltf.vcxproj +++ b/Externals/tinygltf/tinygltf.vcxproj @@ -32,4 +32,4 @@ - + \ No newline at end of file diff --git a/Languages/Languages.vcxproj b/Languages/Languages.vcxproj index 925884ea04..b4439e3fd8 100644 --- a/Languages/Languages.vcxproj +++ b/Languages/Languages.vcxproj @@ -25,7 +25,7 @@ - + diff --git a/Source/Core/DolphinLib.vcxproj b/Source/Core/DolphinLib.vcxproj index 104b2d86ed..d569397f87 100644 --- a/Source/Core/DolphinLib.vcxproj +++ b/Source/Core/DolphinLib.vcxproj @@ -71,20 +71,16 @@ - + - - - + - + ]]> @@ -92,10 +88,6 @@ - + \ No newline at end of file diff --git a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj index 7c11dac0dd..b28590ccb5 100644 --- a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj +++ b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj @@ -64,4 +64,4 @@ - + \ No newline at end of file diff --git a/Source/Core/DolphinTool/DolphinTool.vcxproj b/Source/Core/DolphinTool/DolphinTool.vcxproj index 79e1264b38..80514894a2 100644 --- a/Source/Core/DolphinTool/DolphinTool.vcxproj +++ b/Source/Core/DolphinTool/DolphinTool.vcxproj @@ -70,4 +70,4 @@ - + \ No newline at end of file diff --git a/Source/Core/WinUpdater/WinUpdater.vcxproj.filters b/Source/Core/WinUpdater/WinUpdater.vcxproj.filters index d26f8a82cf..867ba6d874 100644 --- a/Source/Core/WinUpdater/WinUpdater.vcxproj.filters +++ b/Source/Core/WinUpdater/WinUpdater.vcxproj.filters @@ -1,10 +1,17 @@  + + - + + + + + + \ No newline at end of file diff --git a/Source/DSPTool/DSPTool.vcxproj.filters b/Source/DSPTool/DSPTool.vcxproj.filters index d5c714c943..f7ce39d1b7 100644 --- a/Source/DSPTool/DSPTool.vcxproj.filters +++ b/Source/DSPTool/DSPTool.vcxproj.filters @@ -5,20 +5,6 @@ {0b70242b-1d98-432f-a60e-d4ca0674852e} - - - TestData - - - TestData - - - TestData - - - TestData - - diff --git a/Source/PCH/pch.h b/Source/PCH/pch.h index 484f2d343b..d3410b64a2 100644 --- a/Source/PCH/pch.h +++ b/Source/PCH/pch.h @@ -6,15 +6,15 @@ #define STRINGIFY_HELPER(x) #x #define STRINGIFY(x) STRINGIFY_HELPER(x) -#if defined _MSC_FULL_VER && _MSC_FULL_VER < 193632532 +#if defined _MSC_FULL_VER && _MSC_FULL_VER < 195035717 #pragma message("Current _MSC_FULL_VER: " STRINGIFY(_MSC_FULL_VER)) -#error Please update your build environment to the latest Visual Studio 2022! +#error Please update your build environment to the latest Visual Studio! #endif #include -#ifndef NTDDI_WIN10_NI +#ifndef NTDDI_WIN11_GE #pragma message("Current WDK_NTDDI_VERSION: " STRINGIFY(WDK_NTDDI_VERSION)) -#error Windows 10.0.22621 SDK or later is required +#error Windows 10.0.26100.6901 SDK or later is required #endif #undef STRINGIFY diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj index 698e33bc37..09df041ed9 100644 --- a/Source/UnitTests/UnitTests.vcxproj +++ b/Source/UnitTests/UnitTests.vcxproj @@ -122,4 +122,4 @@ - + \ No newline at end of file diff --git a/Source/VSProps/Configuration.Base.props b/Source/VSProps/Configuration.Base.props index d36fe43c89..22c53dd135 100644 --- a/Source/VSProps/Configuration.Base.props +++ b/Source/VSProps/Configuration.Base.props @@ -1,7 +1,7 @@ - v143 + v145 Unicode x64 ARM64