diff --git a/README.md b/README.md index 0589d928..36a43056 100644 --- a/README.md +++ b/README.md @@ -46,9 +46,9 @@ Hosting for Moonlight's Raspberry Pi and L4T package repositories is graciously * [WiX Toolset](https://wixtoolset.org/releases/) v3.11 or later (only if building installers for non-development PCs) ### macOS Build Requirements -* Qt 5.15 SDK or later -* macOS High Sierra (10.13) or later -* Xcode 11 +* Qt 6.2 SDK or later +* macOS Mojave (10.14) or later +* Xcode 13 * [create-dmg](https://github.com/sindresorhus/create-dmg) (only if building DMGs for use on non-development Macs) ### Linux/Unix Build Requirements diff --git a/app/Info.plist b/app/Info.plist index 8bb22999..8c08c73b 100644 --- a/app/Info.plist +++ b/app/Info.plist @@ -17,7 +17,7 @@ CFBundleSignature ???? LSMinimumSystemVersion - 10.13 + 10.14 NSPrincipalClass NSApplication NSSupportsAutomaticGraphicsSwitching diff --git a/appveyor.yml b/appveyor.yml index 1b9b00a9..0f9cc1ac 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 QTDIR: C:\Qt\5.15 - - APPVEYOR_BUILD_WORKER_IMAGE: macOS + - APPVEYOR_BUILD_WORKER_IMAGE: macOS-BigSur BUILD_TARGET: macos - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1604 BUILD_TARGET: steamlink @@ -45,7 +45,7 @@ build_script: - cmd: 'scripts\generate-bundle.bat Release' - sh: '[ "$BUILD_TARGET" != linux ] || source /opt/qt515/bin/qt515-env.sh' - sh: '[ "$BUILD_TARGET" != linux ] || PATH=$PATH:$HOME/bin scripts/build-appimage.sh' - - sh: '[ "$BUILD_TARGET" != macos ] || PATH=$PATH:$HOME/Qt/5.15/clang_64/bin scripts/generate-dmg.sh Release' + - sh: '[ "$BUILD_TARGET" != macos ] || PATH=$PATH:$HOME/Qt/6.2/macos/bin scripts/generate-dmg.sh Release' - sh: '[ "$BUILD_TARGET" != steamlink ] || STEAMLINK_SDK_PATH=$HOME/steamlink-sdk scripts/build-steamlink-app.sh' after_build: diff --git a/scripts/generate-dmg.sh b/scripts/generate-dmg.sh index ef34ad88..e58bd9cd 100755 --- a/scripts/generate-dmg.sh +++ b/scripts/generate-dmg.sh @@ -1,6 +1,5 @@ # This script requires create-dmg to be installed from https://github.com/sindresorhus/create-dmg BUILD_CONFIG=$1 -ARCH=$2 fail() { @@ -18,10 +17,6 @@ BUILD_FOLDER=$BUILD_ROOT/build-$BUILD_CONFIG INSTALLER_FOLDER=$BUILD_ROOT/installer-$BUILD_CONFIG VERSION=`cat $SOURCE_ROOT/app/version.txt` -if [ "$ARCH" != "" ]; then - BUILD_FOLDER=$BUILD_FOLDER-$ARCH -fi - if [ "$SIGNING_PROVIDER_SHORTNAME" == "" ]; then SIGNING_PROVIDER_SHORTNAME=$SIGNING_IDENTITY fi @@ -40,7 +35,7 @@ mkdir $INSTALLER_FOLDER echo Configuring the project pushd $BUILD_FOLDER -qmake $SOURCE_ROOT/moonlight-qt.pro || fail "Qmake failed!" +qmake $SOURCE_ROOT/moonlight-qt.pro QMAKE_APPLE_DEVICE_ARCHS="x86_64 arm64" || fail "Qmake failed!" popd echo Compiling Moonlight in $BUILD_CONFIG configuration @@ -48,16 +43,6 @@ pushd $BUILD_FOLDER make -j$(sysctl -n hw.logicalcpu) $(echo "$BUILD_CONFIG" | tr '[:upper:]' '[:lower:]') || fail "Make failed!" popd -if [ "$ARCH" != "" ]; then - echo Single arch binary build successful - exit 0 -fi - -if [ "$MOONLIGHT_ALT_ARCH" != "" ]; then - echo Creating Universal binary with alternate arch - lipo $BUILD_FOLDER/app/Moonlight.app/Contents/MacOS/Moonlight $BUILD_FOLDER-$MOONLIGHT_ALT_ARCH/app/Moonlight.app/Contents/MacOS/Moonlight -create -o $BUILD_FOLDER/app/Moonlight.app/Contents/MacOS/Moonlight -fi - echo Saving dSYM file pushd $BUILD_FOLDER dsymutil app/Moonlight.app/Contents/MacOS/Moonlight -o Moonlight-$VERSION.dsym || fail "dSYM creation failed!"