monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-22 19:49:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4156

Browse source 
ad1b53f main: add ARM build tag for auto updater (selsta)
This commit is contained in:
luigi1111 2023-09-14 22:25:31 -05:00
commit ca304fc63d
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main.qml
View file

@ -2186,7 +2186,7 @@ ApplicationWindow {
function getBuildTag() { function getBuildTag() {
if (isMac) { if (isMac) {
return "mac-x64"; return isARM ? "mac-armv8" : "mac-x64";
} }
if (isWindows) { if (isWindows) {
return oshelper.installed ? "install-win-x64" : "win-x64"; return oshelper.installed ? "install-win-x64" : "win-x64";

5
src/main/main.cpp
View file

@ -156,6 +156,7 @@ bool isLinux = false;
bool isTails = false; bool isTails = false;
bool isDesktop = false; bool isDesktop = false;
bool isOpenGL = true; bool isOpenGL = true;
bool isARM = false;
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -177,6 +178,9 @@ int main(int argc, char *argv[])
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
bool isMac = true; bool isMac = true;
#endif #endif
#if defined(__aarch64__)
bool isARM = true;
#endif
// detect low graphics mode (start-low-graphics-mode.bat) // detect low graphics mode (start-low-graphics-mode.bat)
if(qgetenv("QMLSCENE_DEVICE") == "softwarecontext") if(qgetenv("QMLSCENE_DEVICE") == "softwarecontext")
@ -483,6 +487,7 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
engine.rootContext()->setContextProperty("isAndroid", isAndroid); engine.rootContext()->setContextProperty("isAndroid", isAndroid);
engine.rootContext()->setContextProperty("isOpenGL", isOpenGL); engine.rootContext()->setContextProperty("isOpenGL", isOpenGL);
engine.rootContext()->setContextProperty("isTails", isTails); engine.rootContext()->setContextProperty("isTails", isTails);
engine.rootContext()->setContextProperty("isARM", isARM);
engine.rootContext()->setContextProperty("screenAvailableWidth", screenAvailableSize.width()); engine.rootContext()->setContextProperty("screenAvailableWidth", screenAvailableSize.width());
engine.rootContext()->setContextProperty("screenAvailableHeight", screenAvailableSize.height()); engine.rootContext()->setContextProperty("screenAvailableHeight", screenAvailableSize.height());