From 7c05d62e01393531fa1e68b0f11e9510726316a7 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Tue, 26 Nov 2024 11:26:27 +0000 Subject: [PATCH 1/3] Upgrade buildscripts --- build/Build.csproj | 4 ++-- buildscripts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/Build.csproj b/build/Build.csproj index e38356c..da7c149 100644 --- a/build/Build.csproj +++ b/build/Build.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 $(MSBuildProjectDirectory) enable enable @@ -26,7 +26,7 @@ - + diff --git a/buildscripts b/buildscripts index 388432d..5cd1ee3 160000 --- a/buildscripts +++ b/buildscripts @@ -1 +1 @@ -Subproject commit 388432db8c7c5eb0a16bf9324e5e75f801795cf4 +Subproject commit 5cd1ee39dfa0e570b125260d4d19753232c1c29e From 0c54ef59ef8d7ee2b5c5cc8e13faa1447d42eda4 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Tue, 26 Nov 2024 11:38:54 +0000 Subject: [PATCH 2/3] Build Linux in release mode --- build/BuildLinuxTask.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BuildLinuxTask.cs b/build/BuildLinuxTask.cs index 246ca03..f013814 100644 --- a/build/BuildLinuxTask.cs +++ b/build/BuildLinuxTask.cs @@ -14,7 +14,7 @@ public override void Run(BuildContext context) var buildWorkingDir = "openal-soft/build_linux"; context.CreateDirectory(buildWorkingDir); 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 -DALSOFT_BACKEND_SNDIO=OFF .." }); + context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "-DALSOFT_TESTS=OFF -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_INSTALL=OFF -DALSOFT_BACKEND_SNDIO=OFF -DCMAKE_BUILD_TYPE=Release .." }); context.StartProcess("make", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "" }); context.CopyFile($"{buildWorkingDir}/libopenal.so", $"{context.ArtifactsDir}/linux-x64/libopenal.so"); BuildAndroid (context, "arm64-v8a", "android-arm64", "23"); From aa06d0e5ef49dfa1b748f3df5733281b2babb8cf Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Tue, 26 Nov 2024 12:00:12 +0000 Subject: [PATCH 3/3] Disable some stuff for android --- build/BuildLinuxTask.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BuildLinuxTask.cs b/build/BuildLinuxTask.cs index f013814..1032dd9 100644 --- a/build/BuildLinuxTask.cs +++ b/build/BuildLinuxTask.cs @@ -29,7 +29,7 @@ void BuildAndroid (BuildContext context, string arch, string rid, string minNdk) var buildWorkingDir = $"openal-soft/build_android_{arch}"; context.CreateDirectory(buildWorkingDir); context.CreateDirectory($"{context.ArtifactsDir}/{rid}"); - context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = $"-DANDROID_ABI={arch} -DANDROID_PLATFORM={minNdk} -DCMAKE_TOOLCHAIN_FILE={ndk}/build/cmake/android.toolchain.cmake -DALSOFT_EMBED_HRTF_DATA=TRUE -DALSOFT_REQUIRE_OPENSL=ON -DCMAKE_BUILD_TYPE=Release -DANDROID_NDK={ndk} .." }); + context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = $"-DANDROID_ABI={arch} -DANDROID_PLATFORM={minNdk} -DCMAKE_TOOLCHAIN_FILE={ndk}/build/cmake/android.toolchain.cmake -DALSOFT_TESTS=OFF -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_INSTALL=OFF -DALSOFT_EMBED_HRTF_DATA=TRUE -DALSOFT_REQUIRE_OPENSL=ON -DCMAKE_BUILD_TYPE=Release -DANDROID_NDK={ndk} .." }); context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "--build . --config Release" }); context.CopyFile($"{buildWorkingDir}/libopenal.so", $"{context.ArtifactsDir}/{rid}/libopenal.so"); }