External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2026-01-01 21:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

NOISSUE add some arch probing code

Browse Source
This commit is contained in:
Petr Mrázek
2023-09-02 03:16:53 +02:00
parent 9ec1d43565
commit f458204a52
4 changed files with 67 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/systeminfo/src/sys_apple.cpp
View File

@@ -77,3 +77,21 @@ bool Sys::lookupSystemStatusCode(uint64_t code, std::string &name, std::string &
{
return false;
}
Sys::Architecture Sys::systemArchitecture() {
struct utsname buf;
uname(&buf);
QString arch = buf.machine;
if (arch == "x86_64") {
return { ArchitectureType::AMD64, arch };
}
else if (arch == "i386") {
return { ArchitectureType::I386, arch };
}
else if (arch == "arm64") {
return { ArchitectureType::ARM64, arch };
}
else {
return { ArchitectureType::Undetermined, arch };
}
}

16
libraries/systeminfo/src/sys_unix.cpp
View File

@@ -117,6 +117,22 @@ Sys::DistributionInfo Sys::getDistributionInfo()
return result;
}
Sys::Architecture Sys::systemArchitecture() {
QString qtArch = QSysInfo::currentCpuArchitecture();
if (qtArch == "x86_64") {
return { ArchitectureType::AMD64, qtArch };
}
else if (qtArch == "i386") {
return { ArchitectureType::I386, qtArch };
}
else if (qtArch == "arm64") {
return { ArchitectureType::ARM64, qtArch };
}
else {
return { ArchitectureType::Undetermined, qtArch };
}
}
bool Sys::lookupSystemStatusCode(uint64_t code, std::string &name, std::string &description)
{
return false;

19
libraries/systeminfo/src/sys_win32.cpp
View File

@@ -94,3 +94,22 @@ bool Sys::lookupSystemStatusCode(uint64_t code, std::string &name, std::string &
return hasCodeName || hasDescription;
}
Sys::Architecture Sys::systemArchitecture() {
SYSTEM_INFO info;
ZeroMemory(&info, sizeof(SYSTEM_INFO));
GetNativeSystemInfo(&info);
auto arch = info.wProcessorArchitecture;
QString qtArch = QSysInfo::currentCpuArchitecture();
switch (arch) {
case PROCESSOR_ARCHITECTURE_AMD64:
return { ArchitectureType::AMD64, "x86_64" };
case PROCESSOR_ARCHITECTURE_ARM64:
return { ArchitectureType::ARM64, "arm64" };
case PROCESSOR_ARCHITECTURE_INTEL:
return { ArchitectureType::I386, "i386" };
default:
return { ArchitectureType::Undetermined, qtArch };
}
}