Try to fix windows and mac

MonoGame · Sep 5, 2024 · 52c375f · 52c375f
1 parent e451286
commit 52c375f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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");
     }