From 08bbece268868fc755949d5628f6e81f66766efa Mon Sep 17 00:00:00 2001 From: Casper Jeukendrup <48658420+cbjeukendrup@users.noreply.github.com> Date: Sat, 23 May 2026 19:35:23 +0200 Subject: [PATCH 1/2] CMake: Remove `MUSE_COMPILE_BUILD_64` option that does nothing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And remove cmake_wrapper.bat completely, as it is not used by this repo: it is a helper for MuseScore Studio’s `build.cmake` script. --- .../cmake/SetupBuildEnvironment.cmake | 5 ---- buildscripts/tools/cmake_wrapper.bat | 28 ------------------- framework/cmake/MuseDeclareOptions.cmake | 1 - 3 files changed, 34 deletions(-) delete mode 100644 buildscripts/tools/cmake_wrapper.bat diff --git a/buildscripts/cmake/SetupBuildEnvironment.cmake b/buildscripts/cmake/SetupBuildEnvironment.cmake index d3e2dbb182..994b4ab30a 100644 --- a/buildscripts/cmake/SetupBuildEnvironment.cmake +++ b/buildscripts/cmake/SetupBuildEnvironment.cmake @@ -86,11 +86,6 @@ endif() if(CC_IS_MINGW) # https://musescore.org/node/22048 add_compile_options(-mno-ms-bitfields) - - if(NOT MUSE_COMPILE_BUILD_64) - add_link_options("-Wl,--large-address-aware") - endif() - add_compile_definitions(_UNICODE UNICODE) endif() diff --git a/buildscripts/tools/cmake_wrapper.bat b/buildscripts/tools/cmake_wrapper.bat deleted file mode 100644 index d285415341..0000000000 --- a/buildscripts/tools/cmake_wrapper.bat +++ /dev/null @@ -1,28 +0,0 @@ -@echo off -setlocal EnableDelayedExpansion - -rem Please only use this file to do things that absolutely cannot be done within build.cmake, -rem such as CALL a batch file to set environment variables in the current process. This is not -rem the same as executing a batch file, which would set environment variables in a subprocess. - -set "TARGET_PROCESSOR_BITS=64" -:loop - rem CMD splits arguments on equals sign, so -DFOO=BAR is treated as -DFOO and BAR - if "%~1%~2" == "" goto continue - if "%~1=%~2" == "-DMUSE_COMPILE_BUILD_64=OFF" set "TARGET_PROCESSOR_BITS=32" - shift - goto loop -:continue -echo "TARGET_PROCESSOR_BITS: %TARGET_PROCESSOR_BITS%" - -echo "Setup VS Environment" -set VSWHERE="C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -for /f "usebackq tokens=*" %%i in (`%VSWHERE% -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do ( - set VS_INSTALL_DIR=%%i -) -echo "VS_INSTALL_DIR: %VS_INSTALL_DIR%" -echo "PATH: %PATH%" - -CALL "%VS_INSTALL_DIR%\VC\Auxiliary\Build\vcvars%TARGET_PROCESSOR_BITS%.bat" - -cmake %* diff --git a/framework/cmake/MuseDeclareOptions.cmake b/framework/cmake/MuseDeclareOptions.cmake index a05796547d..2de119c941 100644 --- a/framework/cmake/MuseDeclareOptions.cmake +++ b/framework/cmake/MuseDeclareOptions.cmake @@ -102,7 +102,6 @@ option(MUSE_THREADS_SUPPORT "Build with threads support" ON) option(MUSE_CONFIGURATION_IS_WEB "Configuration is web" OFF) # === Build options === -option(MUSE_COMPILE_BUILD_64 "Build 64 bit version" ON) option(MUSE_COMPILE_ASAN "Enable Address Sanitizer" OFF) option(MUSE_COMPILE_USE_PCH "Use precompiled headers." ON) From bd77920071073c536916374348054812dec51071 Mon Sep 17 00:00:00 2001 From: Casper Jeukendrup <48658420+cbjeukendrup@users.noreply.github.com> Date: Sat, 23 May 2026 19:35:47 +0200 Subject: [PATCH 2/2] Fix one more "implicit `this` capture" warning --- framework/cloud/musescorecom/musescorecomservice.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/cloud/musescorecom/musescorecomservice.cpp b/framework/cloud/musescorecom/musescorecomservice.cpp index a356778df2..4e2fe53188 100644 --- a/framework/cloud/musescorecom/musescorecomservice.cpp +++ b/framework/cloud/musescorecom/musescorecomservice.cpp @@ -586,7 +586,7 @@ Promise MuseScoreComService::doUploadScore(DevicePtr scoreData, const QStri const ID scoreId = idFromCloudUrl(sourceUrl); - return checkScoreAlreadyUploaded(scoreId).then(this, [=](const RetVal& alreadyUploaded, auto resolve) { + return checkScoreAlreadyUploaded(scoreId).then(this, [=, this](const RetVal& alreadyUploaded, auto resolve) { if (!alreadyUploaded.ret) { return resolve(alreadyUploaded.ret); }