ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix AutoUpdaterDialog building

This commit is contained in:
Stenzek 2023-12-27 14:33:59 +10:00 committed by Connor McLaughlin
parent 59d29b3648
commit 33958fed96
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcsx2-qt/AutoUpdaterDialog.cpp
View File

@ -20,6 +20,8 @@
#include "common/HTTPDownloader.h" #include "common/HTTPDownloader.h"
#include "common/StringUtil.h" #include "common/StringUtil.h"
#include "cpuinfo.h"
#include <functional> #include <functional>
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QtCore/QDir> #include <QtCore/QDir>
@ -220,6 +222,11 @@ void AutoUpdaterDialog::queueUpdateCheck(bool display_message)
void AutoUpdaterDialog::getLatestReleaseComplete(s32 status_code, std::vector<u8> data) void AutoUpdaterDialog::getLatestReleaseComplete(s32 status_code, std::vector<u8> data)
{ {
#ifdef _M_X86
// should already be initialized, but just in case this somehow runs before the CPU thread starts setting up...
cpuinfo_initialize();
#endif
#ifdef AUTO_UPDATER_SUPPORTED #ifdef AUTO_UPDATER_SUPPORTED
bool found_update_info = false; bool found_update_info = false;
@ -277,12 +284,20 @@ void AutoUpdaterDialog::getLatestReleaseComplete(s32 status_code, std::vector<u8
#endif #endif
} }
if (is_symbols || (!x86caps.hasAVX2 && is_avx2)) if (is_symbols)
{ {
// skip this asset // skip this asset
continue; continue;
} }
#ifdef _M_X86
if (is_avx2 && cpuinfo_has_x86_avx2())
{
// skip this asset
continue;
}
#endif
int score; int score;
if (is_perfect_match) if (is_perfect_match)
score = 4; // #1 choice is the one matching this binary score = 4; // #1 choice is the one matching this binary

4
pcsx2-qt/pcsx2-qt.vcxproj
View File

@ -42,6 +42,7 @@
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\simpleini\include</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\simpleini\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\imgui\include</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\imgui\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\demangler\include</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\demangler\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\cpuinfo\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\rapidyaml\rapidyaml\ext\c4core\src\c4\ext\fast_float\include;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\rapidyaml\rapidyaml\ext\c4core\src\c4\ext\fast_float\include;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\sdl2\include;$(SolutionDir)3rdparty\sdl2\SDL\include</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)3rdparty\sdl2\include;$(SolutionDir)3rdparty\sdl2\SDL\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)pcsx2</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)pcsx2</AdditionalIncludeDirectories>
@ -72,6 +73,9 @@
<ProjectReference Include="$(SolutionDir)pcsx2\pcsx2.vcxproj"> <ProjectReference Include="$(SolutionDir)pcsx2\pcsx2.vcxproj">
<Project>{6c7986c4-3e4d-4dcc-b3c6-6bb12b238995}</Project> <Project>{6c7986c4-3e4d-4dcc-b3c6-6bb12b238995}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\3rdparty\cpuinfo\cpuinfo.vcxproj">
<Project>{7e183337-a7e9-460c-9d3d-568bc9f9bcc1}</Project>
</ProjectReference>
<ProjectReference Include="..\3rdparty\lzma\lzma.vcxproj"> <ProjectReference Include="..\3rdparty\lzma\lzma.vcxproj">
<Project>{a4323327-3f2b-4271-83d9-7f9a3c66b6b2}</Project> <Project>{a4323327-3f2b-4271-83d9-7f9a3c66b6b2}</Project>
</ProjectReference> </ProjectReference>