Skip to content
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

Jump to bottom

Raise macOS deployment target to 10.13 #232

Draft
wants to merge 2 commits into
base: 3.x
Choose a base branch
from
Draft

Raise macOS deployment target to 10.13 #232

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
7a25a04
Raise macOS deployment target to 10.13
cbjeukendrup Nov 23, 2023
c440365
test 5
Jojo-Schmitz Nov 19, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/build_macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ on:

env:
CURRENT_RELEASE_BRANCH: 3.x
DEVELOPER_DIR: /Applications/Xcode_13.1.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer

jobs:
macos:
runs-on: macos-12
runs-on: macos-13
steps:
- name: Cancel Previous Runs
uses: styfle/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@ if (APPLE)
set (CMAKE_CXX_COMPILER_ID "Clang")
set(CMAKE_OSX_ARCHITECTURES x86_64)

set(MACOSX_DEPLOYMENT_TARGET 10.10)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10)
set(MACOSX_DEPLOYMENT_TARGET 10.13)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)

set(HAS_AUDIOFILE TRUE) # Requires libsndfile
set(MAC_APPCAST_URL "")
Expand Down
2 changes: 1 addition & 1 deletion build/MacOSXBundleInfo.plist.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@
<key>LSRequiresCarbon</key>
<true/>
<key>LSMinimumSystemVersion</key>
<string>10.10.0</string>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key>
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
<key>LSApplicationCategoryType</key>
Expand Down
3 changes: 3 additions & 0 deletions build/ci/macos/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ echo "BUILD_UI_MU4: $BUILD_UI_MU4"

MUSESCORE_REVISION=$(git rev-parse --short=7 HEAD)

# reosolve error reg. "Cycle in dependencies between targets 'audio' and 'awl'"
defaults write com.apple.dt.XCBuild EnableSwiftBuildSystemIntegration 0

make -f Makefile.osx \
MUSESCORE_BUILD_CONFIG=$MUSESCORE_BUILD_CONFIG \
MUSESCORE_REVISION=$MUSESCORE_REVISION \
Expand Down
3 changes: 2 additions & 1 deletion build/ci/macos/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ echo "Setup MacOS build environment"
trap 'echo Setup failed; exit 1' ERR
SKIP_ERR_FLAG=true

export MACOSX_DEPLOYMENT_TARGET=10.10
export MACOSX_DEPLOYMENT_TARGET=10.13

# install dependencies
wget -c --no-check-certificate -nv -O bottles.zip https://musescore.org/sites/musescore.org/files/2020-02/bottles-MuseScore-3.0-yosemite.zip
Expand All @@ -30,6 +30,7 @@ rm '/usr/local/bin/python3.11-config'

# additional dependencies
brew install jack
brew install lame

BREW_CELLAR=$(brew --cellar)
BREW_PREFIX=$(brew --prefix)
Expand Down
Loading