pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-02-10 18:05:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Updmanager: adaptation for arm64' (#514) from fix/arm64-update into release/v9.2.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/desktop-apps/pulls/514
This commit is contained in:
Oleg Korshul
2025-11-10 16:04:23 +00:00
parent ba4ab11ff6 4052e420c5
commit da00bea98c
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
win-linux/extras/update-daemon/src/classes/csvcmanager.cpp
View File

@ -95,9 +95,11 @@ using std::vector;
auto currentArch()->tstring
{
#ifdef _WIN32
# ifdef _WIN64
# if defined(_M_ARM64)
return L"_arm64";
# elif defined(_M_X64)
return L"_x64";
# else
# elif defined(_M_IX86)
return L"_x86";
# endif
#else
@ -513,9 +515,11 @@ void CSvcManager::onCompleteSlot(const int error, const tstring &filePath)
tstring curr_svc_version = _T(VER_FILEVERSION_STR);
JsonObject package = root.value(_T("package")).toObject();
#ifdef _WIN32
# ifdef _WIN64
# if defined(_M_ARM64)
JsonObject win = package.value(_T("win_arm64")).toObject();
# elif defined(_M_X64)
JsonObject win = package.value(_T("win_64")).toObject();
# else
# elif defined(_M_IX86)
JsonObject win = package.value(_T("win_32")).toObject();
# endif
#else

6
win-linux/src/cupdatemanager.cpp
View File

@ -163,9 +163,11 @@ void CUpdateManager::DialogSchedule::addToSchedule(const QString &method, const
auto currentArch()->QString
{
#ifdef _WIN32
# ifdef _WIN64
# if defined(_M_ARM64)
return "_arm64";
# elif defined(_M_X64)
return "_x64";
# else
# elif defined(_M_IX86)
return "_x86";
# endif
#else