diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 34f1bc8..6e73fa9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest, macos-latest, ubuntu-22.04, ubuntu-22.04-arm] + os: [windows-latest, macos-latest, ubuntu-24.04, ubuntu-24.04-arm] fail-fast: false steps: - name: Expose GitHub Runtime diff --git a/build/BuildWindowsTask.cs b/build/BuildWindowsTask.cs index 9e5b454..e3c22be 100644 --- a/build/BuildWindowsTask.cs +++ b/build/BuildWindowsTask.cs @@ -14,14 +14,14 @@ public override void Run(BuildContext context) var buildWorkingDir = "openal-soft/build_windows_x64"; context.CreateDirectory(buildWorkingDir); context.CreateDirectory($"{context.ArtifactsDir}/win-x64/"); - context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DALSOFT_TESTS=OFF -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_INSTALL=OFF -DFORCE_STATIC_VCRT=ON -A x64 .." }); + context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DALSOFT_TESTS=OFF -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_INSTALL=OFF -DFORCE_STATIC_VCRT=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -A x64 .." }); context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "--build . --config release" }); context.CopyFile(@"openal-soft/build_windows_x64/Release/OpenAL32.dll", $"{context.ArtifactsDir}/win-x64/openal.dll"); buildWorkingDir = "openal-soft/build_windows_arm64"; context.CreateDirectory(buildWorkingDir); context.CreateDirectory($"{context.ArtifactsDir}/win-arm64/"); - context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DALSOFT_TESTS=OFF -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_INSTALL=OFF -DFORCE_STATIC_VCRT=ON -A ARM64 .." }); + context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DALSOFT_TESTS=OFF -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_INSTALL=OFF -DFORCE_STATIC_VCRT=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -A ARM64 .." }); context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "--build . --config release" }); context.CopyFile(@"openal-soft/build_windows_arm64/Release/OpenAL32.dll", $"{context.ArtifactsDir}/win-arm64/openal.dll"); } diff --git a/buildscripts b/buildscripts index 43f13de..67428a7 160000 --- a/buildscripts +++ b/buildscripts @@ -1 +1 @@ -Subproject commit 43f13de8d1dd568f35eb9fe665fe4824e90a437d +Subproject commit 67428a7129efd8e79aac28b8f4206287bcfc149f diff --git a/openal-soft b/openal-soft index dc7d705..9335813 160000 --- a/openal-soft +++ b/openal-soft @@ -1 +1 @@ -Subproject commit dc7d7054a5b4f3bec1dc23a42fd616a0847af948 +Subproject commit 93358135d92f3aa2672ed95f9c6bb04f8482d578