diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 78919ea..4d63aec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: with: submodules: recursive - name: Run CAKE - run: dotnet run --project ./build/Build.csproj --universalBinary=true + run: dotnet run --project ./build/Build.csproj env: ACTIONS_RUNTIME_TOKEN: ${{ env.ACTIONS_RUNTIME_TOKEN }} ACTIONS_RUNTIME_URL: "${{ env.ACTIONS_RUNTIME_URL }}" @@ -48,7 +48,7 @@ jobs: - name: Rename License File run: mv ./openal-soft/LICENSE-pffft ./openal-soft/LICENSE - name: Run CAKE - run: dotnet run --project ./build/Build.csproj -- --target=Package --universalBinary=true --libraryname=OpenAL --licensepath=openal-soft/LICENSE -v:diagnostic + run: dotnet run --project ./build/Build.csproj -- --target=Package --libraryname=OpenAL --licensepath=openal-soft/LICENSE -v:diagnostic env: ACTIONS_RUNTIME_TOKEN: ${{ env.ACTIONS_RUNTIME_TOKEN }} ACTIONS_RUNTIME_URL: "${{ env.ACTIONS_RUNTIME_URL }}" diff --git a/build/BuildWindowsTask.cs b/build/BuildWindowsTask.cs index e661e4e..3882cdb 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 -A x64 .." }); + context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DALSOFT_TESTS=OFF -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_INSTALL=OFF -D CMAKE_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 -A ARM64 .." }); + context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DALSOFT_TESTS=OFF -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_INSTALL=OFF -D CMAKE_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"); }