diff --git a/.ci/build-mac-arm64.sh b/.ci/build-mac-arm64.sh index f03ce64524..c9c60de240 100644 --- a/.ci/build-mac-arm64.sh +++ b/.ci/build-mac-arm64.sh @@ -4,13 +4,13 @@ brew_arm64_install_packages() { for pkg in "$@"; do echo "Fetching bottle for $pkg (arm64)..." - bottle_path="$("$BREW_ARM64_PATH/bin/brew" --cache --bottle-tag=arm64_ventura "$pkg")" + bottle_path="$("$BREW_ARM64_PATH/bin/brew" --cache --bottle-tag=arm64_sonoma "$pkg")" if [ ! -f "$bottle_path" ]; then - if ! "$BREW_ARM64_PATH/bin/brew" fetch --force --verbose --debug --bottle-tag=arm64_ventura "$pkg"; then + if ! "$BREW_ARM64_PATH/bin/brew" fetch --force --verbose --debug --bottle-tag=arm64_sonoma "$pkg"; then echo "Failed to fetch bottle for $pkg" return 1 fi - bottle_path="$("$BREW_ARM64_PATH/bin/brew" --cache --bottle-tag=arm64_ventura "$pkg")" + bottle_path="$("$BREW_ARM64_PATH/bin/brew" --cache --bottle-tag=arm64_sonoma "$pkg")" fi echo "Installing $pkg (arm64)..." @@ -90,8 +90,8 @@ export SDL3_DIR="$BREW_ARM64_PATH/opt/sdl3/lib/cmake/SDL3" export PATH="$BREW_X64_PATH/opt/llvm@$LLVM_COMPILER_VER/bin:$WORKDIR/qt-downloader/$QT_VER/clang_64/bin:$BREW_BIN:$BREW_SBIN:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin:$PATH" export LDFLAGS="-L$BREW_ARM64_PATH/lib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavcodec.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavformat.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libavutil.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libswscale.dylib $BREW_ARM64_PATH/opt/ffmpeg@5/lib/libswresample.dylib $BREW_ARM64_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++.1.dylib $BREW_ARM64_PATH/lib/libSDL3.dylib $BREW_ARM64_PATH/lib/libGLEW.dylib $BREW_ARM64_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/libunwind.1.dylib -Wl,-rpath,$BREW_ARM64_PATH/lib" -export CPPFLAGS="-I$BREW_ARM64_PATH/include -I$BREW_X64_PATH/include -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" -export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" +export CPPFLAGS="-I$BREW_ARM64_PATH/include -I$BREW_X64_PATH/include -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" +export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" export LIBRARY_PATH="$BREW_ARM64_PATH/lib" export LD_LIBRARY_PATH="$BREW_ARM64_PATH/lib" @@ -112,7 +112,7 @@ sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVer rm -rf build mkdir build && cd build || exit 1 -export MACOSX_DEPLOYMENT_TARGET=13.0 +export MACOSX_DEPLOYMENT_TARGET=14.0 "$BREW_X64_PATH/bin/cmake" .. \ -DUSE_SDL=ON \ @@ -144,7 +144,7 @@ export MACOSX_DEPLOYMENT_TARGET=13.0 -DCMAKE_IGNORE_PREFIX_PATH=/usr/local/opt \ -DCMAKE_SYSTEM_PROCESSOR=arm64 \ -DCMAKE_TOOLCHAIN_FILE=buildfiles/cmake/TCDarwinARM64.cmake \ - -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" \ + -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" \ -G Ninja "$BREW_PATH/bin/ninja"; build_status=$?; diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh index 809ec1faa9..2ae92fb9fd 100644 --- a/.ci/build-mac.sh +++ b/.ci/build-mac.sh @@ -57,8 +57,8 @@ export SDL3_DIR="$BREW_X64_PATH/opt/sdl3/lib/cmake/SDL3" export PATH="$BREW_X64_PATH/opt/llvm@$LLVM_COMPILER_VER/bin:$WORKDIR/qt-downloader/$QT_VER/clang_64/bin:$BREW_BIN:$BREW_SBIN:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/Library/Apple/usr/bin:$PATH" export LDFLAGS="-L$BREW_X64_PATH/lib -Wl,-rpath,$BREW_X64_PATH/lib" -export CPPFLAGS="-I$BREW_X64_PATH/include -msse -msse2 -mcx16 -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" -export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" +export CPPFLAGS="-I$BREW_X64_PATH/include -msse -msse2 -mcx16 -no-pie -D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" +export CFLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" export LIBRARY_PATH="$BREW_X64_PATH/lib" export LD_LIBRARY_PATH="$BREW_X64_PATH/lib" @@ -78,7 +78,7 @@ sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVer mkdir build && cd build || exit 1 -export MACOSX_DEPLOYMENT_TARGET=13.0 +export MACOSX_DEPLOYMENT_TARGET=14.0 "$BREW_X64_PATH/bin/cmake" .. \ -DUSE_SDL=ON \ @@ -107,7 +107,7 @@ export MACOSX_DEPLOYMENT_TARGET=13.0 -DLLVM_TARGET_ARCH=X86_64 \ -DCMAKE_OSX_ARCHITECTURES=x86_64 \ -DCMAKE_IGNORE_PATH="$BREW_PATH/lib" \ - -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=130000" \ + -DCMAKE_CXX_FLAGS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=140000" \ -G Ninja "$BREW_PATH/bin/ninja"; build_status=$?; diff --git a/azure-pipelines.yml b/azure-pipelines.yml index afaa294b7f..a1401a7e90 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -152,7 +152,7 @@ jobs: LLVM_COMPILER_VER: '19' pool: - vmImage: "macOS-13" + vmImage: "macOS-14" steps: - task: Cache@2 @@ -213,7 +213,7 @@ jobs: LLVM_COMPILER_VER: '19' pool: - vmImage: "macOS-13" + vmImage: "macOS-14" steps: - task: Cache@2 diff --git a/rpcs3/rpcs3.plist.in b/rpcs3/rpcs3.plist.in index 31df6d03a1..53902adea3 100644 --- a/rpcs3/rpcs3.plist.in +++ b/rpcs3/rpcs3.plist.in @@ -33,7 +33,7 @@ LSApplicationCategoryType public.app-category.games LSMinimumSystemVersion - 13.0 + 14.0 NSCameraUsageDescription The camera will be used for PlayStation Eye emulation NSMicrophoneUsageDescription