Skip to content

Commit

Permalink
Merge pull request #4156
Browse files Browse the repository at this point in the history
ad1b53f main: add ARM build tag for auto updater (selsta)
  • Loading branch information
luigi1111 committed Sep 15, 2023
2 parents 5a1a349 + ad1b53f commit ca304fc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -2186,7 +2186,7 @@ ApplicationWindow {

function getBuildTag() {
if (isMac) {
return "mac-x64";
return isARM ? "mac-armv8" : "mac-x64";
}
if (isWindows) {
return oshelper.installed ? "install-win-x64" : "win-x64";
Expand Down
5 changes: 5 additions & 0 deletions src/main/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ bool isLinux = false;
bool isTails = false;
bool isDesktop = false;
bool isOpenGL = true;
bool isARM = false;

int main(int argc, char *argv[])
{
Expand All @@ -177,6 +178,9 @@ int main(int argc, char *argv[])
#elif defined(Q_OS_MAC)
bool isMac = true;
#endif
#if defined(__aarch64__)
bool isARM = true;
#endif

// detect low graphics mode (start-low-graphics-mode.bat)
if(qgetenv("QMLSCENE_DEVICE") == "softwarecontext")
Expand Down Expand Up @@ -483,6 +487,7 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
engine.rootContext()->setContextProperty("isAndroid", isAndroid);
engine.rootContext()->setContextProperty("isOpenGL", isOpenGL);
engine.rootContext()->setContextProperty("isTails", isTails);
engine.rootContext()->setContextProperty("isARM", isARM);

engine.rootContext()->setContextProperty("screenAvailableWidth", screenAvailableSize.width());
engine.rootContext()->setContextProperty("screenAvailableHeight", screenAvailableSize.height());
Expand Down

0 comments on commit ca304fc

Please sign in to comment.