0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: support armhf

Browse Source 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu 2022-10-15 12:41:16 +02:00
parent 19ee736e1d
commit 545944cb0d
No known key found for this signature in database
GPG Key ID: C10411294912A422
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
launcher/RuntimeContext.h
View File

@ -29,9 +29,14 @@ struct RuntimeContext {
QString system; QString system;
QString mappedJavaRealArchitecture() const { QString mappedJavaRealArchitecture() const {
if (javaRealArchitecture == "aarch64") { if (javaRealArchitecture == "amd64")
return "x86_64";
if (javaRealArchitecture == "i386" || javaRealArchitecture == "i686")
return "x86";
if (javaRealArchitecture == "aarch64")
return "arm64"; return "arm64";
} if (javaRealArchitecture == "arm" || javaRealArchitecture == "armhf")
return "arm32";
return javaRealArchitecture; return javaRealArchitecture;
} }
@ -48,8 +53,8 @@ struct RuntimeContext {
// "Legacy" refers to the fact that Mojang assumed that these are the only two architectures // "Legacy" refers to the fact that Mojang assumed that these are the only two architectures
bool isLegacyArch() const { bool isLegacyArch() const {
QSet<QString> legacyArchitectures{"amd64", "x86_64", "i386", "i686", "x86"}; const QString mapped = mappedJavaRealArchitecture();
return legacyArchitectures.contains(mappedJavaRealArchitecture()); return mapped == "x86_64" || mapped == "x86";
} }
bool classifierMatches(QString target) const { bool classifierMatches(QString target) const {