Skip to content

CMake: Remove MUSE_COMPILE_BUILD_64 option that does nothing #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igorkorsukov merged 2 commits into from
May 23, 2026
+1 −35
Merged

CMake: Remove MUSE_COMPILE_BUILD_64 option that does nothing #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08bbece
CMake: Remove `MUSE_COMPILE_BUILD_64` option that does nothing
cbjeukendrup May 23, 2026
bd77920
Fix one more "implicit `this` capture" warning
cbjeukendrup May 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions buildscripts/cmake/SetupBuildEnvironment.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
28 changes: 0 additions & 28 deletions buildscripts/tools/cmake_wrapper.bat
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion framework/cloud/musescorecom/musescorecomservice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ Promise<Ret> MuseScoreComService::doUploadScore(DevicePtr scoreData, const QStri

const ID scoreId = idFromCloudUrl(sourceUrl);

return checkScoreAlreadyUploaded(scoreId).then<Ret>(this, [=](const RetVal<bool>& alreadyUploaded, auto resolve) {
return checkScoreAlreadyUploaded(scoreId).then<Ret>(this, [=, this](const RetVal<bool>& alreadyUploaded, auto resolve) {
if (!alreadyUploaded.ret) {
return resolve(alreadyUploaded.ret);
}
Expand Down
1 change: 0 additions & 1 deletion framework/cmake/MuseDeclareOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Loading