From ac38a350a099c7a4b5119c90021270c75949ea0f Mon Sep 17 00:00:00 2001 From: refractionpcsx2 Date: Sun, 9 Jun 2024 15:57:09 +0100 Subject: [PATCH] Updater: Add VC Runtime check --- pcsx2-qt/VCRuntimeChecker.cpp | 8 ++++---- updater/CMakeLists.txt | 1 + updater/updater.vcxproj | 1 + updater/updater.vcxproj.filters | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pcsx2-qt/VCRuntimeChecker.cpp b/pcsx2-qt/VCRuntimeChecker.cpp index ba3f7f387f..009753568d 100644 --- a/pcsx2-qt/VCRuntimeChecker.cpp +++ b/pcsx2-qt/VCRuntimeChecker.cpp @@ -7,10 +7,10 @@ #include "fmt/format.h" // Minimum version is 14.38.33135.0. -static constexpr u32 MIN_VERSION_V0 = 14; -static constexpr u32 MIN_VERSION_V1 = 38; -static constexpr u32 MIN_VERSION_V2 = 33135; -static constexpr u32 MIN_VERSION_V3 = 0; +static constexpr DWORD MIN_VERSION_V0 = 14; +static constexpr DWORD MIN_VERSION_V1 = 38; +static constexpr DWORD MIN_VERSION_V2 = 33135; +static constexpr DWORD MIN_VERSION_V3 = 0; static constexpr const char* DOWNLOAD_URL = "https://aka.ms/vs/17/release/vc_redist.x64.exe"; struct VCRuntimeCheckObject diff --git a/updater/CMakeLists.txt b/updater/CMakeLists.txt index 94368051d5..a6855c8ec0 100644 --- a/updater/CMakeLists.txt +++ b/updater/CMakeLists.txt @@ -9,6 +9,7 @@ target_link_libraries(updater PRIVATE common fmt::fmt) target_include_directories(updater PRIVATE .) if(WIN32) + target_sources(updater PRIVATE ../pcsx2-qt/VCRuntimeChecker.cpp) target_link_libraries(updater PRIVATE LZMA::LZMA Comctl32.lib diff --git a/updater/updater.vcxproj b/updater/updater.vcxproj index fc6446717f..89d6b61571 100644 --- a/updater/updater.vcxproj +++ b/updater/updater.vcxproj @@ -53,6 +53,7 @@ + diff --git a/updater/updater.vcxproj.filters b/updater/updater.vcxproj.filters index a8d3b2125d..4dd046d0a8 100644 --- a/updater/updater.vcxproj.filters +++ b/updater/updater.vcxproj.filters @@ -3,6 +3,7 @@ + Windows