From f53dea94a28099271d33e63aa4afb1a9a81f776d Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 30 Aug 2024 21:36:48 +0100 Subject: [PATCH] Fix even more errors --- build/BuildLinuxTask.cs | 2 +- build/BuildMacOSTask.cs | 2 +- build/BuildWindowsTask.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/BuildLinuxTask.cs b/build/BuildLinuxTask.cs index ce38a07..bd3e98a 100644 --- a/build/BuildLinuxTask.cs +++ b/build/BuildLinuxTask.cs @@ -16,7 +16,7 @@ public override void Run(BuildContext context) context.CreateDirectory($"{context.ArtifactsDir}/linux-x64/"); context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DALSOFT_TESTS=OFF -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_INSTALL=OFF .." }); context.StartProcess("make", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "" }); - context.CopyFile($"{buildWorkingDir}libopenal.so", $"{context.ArtifactsDir}/linux-x64/libopenal.so"); + context.CopyFile($"{buildWorkingDir}/libopenal.so", $"{context.ArtifactsDir}/linux-x64/libopenal.so"); BuildAndroid (context, "arm64-v8a", "android-arm64", "23"); BuildAndroid (context, "armeabi-v7a", "android-arm", "23"); BuildAndroid (context, "x86", "android-x86", "23"); diff --git a/build/BuildMacOSTask.cs b/build/BuildMacOSTask.cs index 24aebce..8121822 100644 --- a/build/BuildMacOSTask.cs +++ b/build/BuildMacOSTask.cs @@ -17,7 +17,7 @@ public override void Run(BuildContext context) context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DCMAKE_OSX_ARCHITECTURES=\"x86_64;arm64\" -DALSOFT_REQUIRE_COREAUDIO=ON -DALSOFT_TESTS=OFF -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_INSTALL=OFF -DCMAKE_BUILD_TYPE=Release .." }); context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "--build . --config Release" }); var files = Directory.GetFiles(System.IO.Path.Combine(buildWorkingDir), "libopenal.*.*.*.dylib", SearchOption.TopDirectoryOnly); - context.CopyFile(files[0], $"{context.ArtifactsDir}/osx/libOpenAL32.dylib"); + context.CopyFile(files[0], $"{context.ArtifactsDir}/osx/libopenal.dylib"); // BuildAndroid (context, "arm64-v8a", "android-arm64", "23"); // BuildAndroid (context, "armeabi-v7a", "android-arm", "23"); // BuildAndroid (context, "x86", "android-x86", "23"); diff --git a/build/BuildWindowsTask.cs b/build/BuildWindowsTask.cs index 5c44fb0..abfa167 100644 --- a/build/BuildWindowsTask.cs +++ b/build/BuildWindowsTask.cs @@ -18,6 +18,6 @@ public override void Run(BuildContext context) //context.ReplaceTextInFiles("assimp/code/assimp.vcxproj", "MultiThreadedDLL", "MultiThreaded"); //context.ReplaceTextInFiles("assimp/contrib/zlib/zlibstatic.vcxproj", "MultiThreadedDLL", "MultiThreaded"); context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "--build . --config release" }); - context.CopyFile(@"openal-soft/Release/OpenAL32.dll", $"{context.ArtifactsDir}/windows-x64/openal.dll"); + context.CopyFile(@"openal-soft/build_windows/Release/OpenAL32.dll", $"{context.ArtifactsDir}/windows-x64/openal.dll"); } }