diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index c86a62e..5dc3bc7 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macOS-12, macOS-14] + os: [macOS-13, macOS-14] BuildType: [Debug, Release] runs-on: ${{ matrix.os }} @@ -27,10 +27,10 @@ jobs: - name: 'CMake Configuration' run: | if [[ "${{ matrix.os }}" == "macOS-14" ]]; then - export OSX_ARCHITECTURES="arm64;x86_64" + export OSX_ARCHITECTURES='"arm64;x86_64"' fi - cmake -B ../nCine-libraries-build -D CMAKE_BUILD_TYPE=${{ matrix.BuildType }} -D CMAKE_OSX_ARCHITECTURES=$OSX_ARCHITECTURES + cmake -B ../nCine-libraries-build -D CMAKE_BUILD_TYPE=${{ matrix.BuildType }} #-D CMAKE_OSX_ARCHITECTURES=$OSX_ARCHITECTURES - name: 'Make' run: | @@ -50,7 +50,7 @@ jobs: if [[ "${{ matrix.os }}" == "macOS-14" ]]; then export OS=macos14 else - export OS=macos12 + export OS=macos13 fi export CC=appleclang diff --git a/cmake/openal-soft.cmake b/cmake/openal-soft.cmake index aaf0b63..41286a8 100644 --- a/cmake/openal-soft.cmake +++ b/cmake/openal-soft.cmake @@ -1,6 +1,6 @@ set(TARGET_OPENAL openal) -set(URL_OPENAL https://github.com/kcat/openal-soft/archive/1.24.0.tar.gz) -set(URL_MD5_OPENAL 9bf204aa3580b35fb27604484f51c6e0) +set(URL_OPENAL https://github.com/kcat/openal-soft/archive/1.24.1.tar.gz) +set(URL_MD5_OPENAL f57dd15086366fc7d73966b8cfde5fe9) set(COMMON_CMAKE_ARGS_OPENAL -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_INSTALL_CONFIG=OFF) if(MSVC) @@ -19,7 +19,7 @@ if(MSVC) ) elseif(APPLE) set(FRAMEWORK_DIR_OPENAL ${DESTINATION_PATH}/${TARGET_OPENAL}.framework) - set(DYLIBNAME_OPENAL libopenal.1.24.0.dylib) + set(DYLIBNAME_OPENAL libopenal.1.24.1.dylib) ExternalProject_Add(project_${TARGET_OPENAL} URL ${URL_OPENAL}