diff --git a/Silk.NET.sln b/Silk.NET.sln index ad76ff1655..1e617f5c78 100644 --- a/Silk.NET.sln +++ b/Silk.NET.sln @@ -122,6 +122,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL.Tutorial001.HelloWindow EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDL", "SDL", "{96567E92-4A89-4AC8-9F20-C2A3FE644D10}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenAL.Soft.Native", "sources\OpenAL\Soft.Native\Silk.NET.OpenAL.Soft.Native.csproj", "{72256365-2C76-4E60-9CF0-A4FFF6F3843F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -204,6 +206,10 @@ Global {3444151F-2DE3-41BC-B5E0-EFBF0091C087}.Debug|Any CPU.Build.0 = Debug|Any CPU {3444151F-2DE3-41BC-B5E0-EFBF0091C087}.Release|Any CPU.ActiveCfg = Release|Any CPU {3444151F-2DE3-41BC-B5E0-EFBF0091C087}.Release|Any CPU.Build.0 = Release|Any CPU + {72256365-2C76-4E60-9CF0-A4FFF6F3843F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {72256365-2C76-4E60-9CF0-A4FFF6F3843F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {72256365-2C76-4E60-9CF0-A4FFF6F3843F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {72256365-2C76-4E60-9CF0-A4FFF6F3843F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -245,6 +251,7 @@ Global {E5E8FFBF-1319-4D33-B084-E732656E8A04} = {5E20252F-E2A0-46C9-BBEF-4CE5C96D0E07} {96567E92-4A89-4AC8-9F20-C2A3FE644D10} = {12B4D1CB-8938-4EC4-8895-79C4E6ABD1E8} {3444151F-2DE3-41BC-B5E0-EFBF0091C087} = {96567E92-4A89-4AC8-9F20-C2A3FE644D10} + {72256365-2C76-4E60-9CF0-A4FFF6F3843F} = {AF13F7C9-4EE2-403E-B3D2-C4C2E45D9EF3} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {78D2CF6A-60A1-43E3-837B-00B73C9DA384} diff --git a/examples/CSharp/OpenAL/Tutorial001.HelloSound/OpenAL.Tutorial001.HelloSound.csproj b/examples/CSharp/OpenAL/Tutorial001.HelloSound/OpenAL.Tutorial001.HelloSound.csproj index f5b988b7bf..958b24053e 100644 --- a/examples/CSharp/OpenAL/Tutorial001.HelloSound/OpenAL.Tutorial001.HelloSound.csproj +++ b/examples/CSharp/OpenAL/Tutorial001.HelloSound/OpenAL.Tutorial001.HelloSound.csproj @@ -5,10 +5,15 @@ net10.0 enable enable + + + + $(NETCoreSdkRuntimeIdentifier) + diff --git a/examples/CSharp/SDL/Tutorial001.HelloWindow/SDL.Tutorial001.HelloWindow.csproj b/examples/CSharp/SDL/Tutorial001.HelloWindow/SDL.Tutorial001.HelloWindow.csproj index bba484a1a4..fa29055bd3 100644 --- a/examples/CSharp/SDL/Tutorial001.HelloWindow/SDL.Tutorial001.HelloWindow.csproj +++ b/examples/CSharp/SDL/Tutorial001.HelloWindow/SDL.Tutorial001.HelloWindow.csproj @@ -5,6 +5,10 @@ net10.0 enable enable + + + + $(NETCoreSdkRuntimeIdentifier) diff --git a/sources/OpenAL/OpenAL/AL.cs b/sources/OpenAL/OpenAL/AL.cs index 116e95ed9e..3408afc67c 100644 --- a/sources/OpenAL/OpenAL/AL.cs +++ b/sources/OpenAL/OpenAL/AL.cs @@ -7,12 +7,17 @@ namespace Silk.NET.OpenAL; public partial class AL { - static AL() => + static AL() + { LoaderInterface.RegisterAlternativeName( "openal", "/System/Library/Frameworks/OpenAL.framework/OpenAL" ); + LoaderInterface.RegisterAlternativeName("openal", "OpenAL32"); + LoaderInterface.RegisterAlternativeName("openal", "soft_oal"); + } + public partial class ThisThread { private static partial IAL ContextFactory() => diff --git a/sources/OpenAL/OpenAL/ALContext.cs b/sources/OpenAL/OpenAL/ALContext.cs index d4d4766d16..9d6b2039e9 100644 --- a/sources/OpenAL/OpenAL/ALContext.cs +++ b/sources/OpenAL/OpenAL/ALContext.cs @@ -13,12 +13,17 @@ public partial class ALContext "CurrentDevice cannot be changed once set, use another API object for additional devices. For more " + "info, see https://dotnet.github.io/Silk.NET/docs/v3/silk.net/static-vs-instance-bindings"; - static ALContext() => + static ALContext() + { LoaderInterface.RegisterAlternativeName( "openal", "/System/Library/Frameworks/OpenAL.framework/OpenAL" ); + LoaderInterface.RegisterAlternativeName("openal", "OpenAL32"); + LoaderInterface.RegisterAlternativeName("openal", "soft_oal"); + } + public unsafe partial class DllImport { [UnmanagedCallersOnly] diff --git a/sources/OpenAL/Soft.Native/Silk.NET.OpenAL.Soft.Native.csproj b/sources/OpenAL/Soft.Native/Silk.NET.OpenAL.Soft.Native.csproj index 27be85c3f7..cdaf214731 100644 --- a/sources/OpenAL/Soft.Native/Silk.NET.OpenAL.Soft.Native.csproj +++ b/sources/OpenAL/Soft.Native/Silk.NET.OpenAL.Soft.Native.csproj @@ -8,7 +8,7 @@ true -framework CoreAudio -framework CoreFoundation -framework AudioUnit -framework ApplicationServices -framework AudioToolbox false - LGPL-2.1+ + LGPL-2.0-or-later