Skip to content

Commit 8bc9ef6

Browse files
authored
Merge pull request #6 from penev92/fixNuget
Fixed NuGet targets file for non-windows
2 parents b58a039 + 91515b0 commit 8bc9ef6

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

.github/workflows/build-natives.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ jobs:
7171
mkdir -p artifacts/x64
7272
yum -y install https://repo.ius.io/ius-release-el7.rpm centos-release-scl scl-utils
7373
yum -y install devtoolset-8 cmake3 bzip2
74+
yum -y install alsa-lib-devel portaudio-devel pulseaudio-libs-devel libsoundio-devel
7475
7576
- name: Compile natives
7677
run: |

OpenAL-CS.dll.config

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<dllmap dll="soft_oal.dll" os="!windows" target="libopenal.so.1"/>
4-
<dllmap dll="soft_oal.dll" os="openbsd" target="libopenal.so"/>
5-
<dllmap dll="soft_oal.dll" os="osx" target="libopenal.1.dylib"/>
3+
<dllmap dll="soft_oal" os="!windows" target="soft_oal.so"/>
4+
<dllmap dll="soft_oal" os="osx" target="soft_oal.dylib"/>
65
</configuration>

OpenRA-OpenAL-CS.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
<Link>soft_oal.dylib</Link>
3232
<Visible>false</Visible>
3333
</Content>
34-
<Content Include="$(MSBuildThisFileDirectory)\..\lib\netstandard2.0\OpenAL-CS.Core.dll.config" Condition="'$(TargetPlatform)' != 'win-x64' And '$(TargetPlatform)' != 'win-x86'">
34+
<Content Include="$(MSBuildThisFileDirectory)\..\lib\netstandard2.0\OpenAL-CS.dll.config" Condition="'$(TargetPlatform)' != 'win-x64' And '$(TargetPlatform)' != 'win-x86'">
3535
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
36-
<Link>OpenAL-CS.Core.dll.config</Link>
36+
<Link>OpenAL-CS.dll.config</Link>
3737
<Visible>false</Visible>
3838
</Content>
3939
</ItemGroup>

src/AL10.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace OpenAL
3535
{
3636
public static class AL10
3737
{
38-
private const string nativeLibName = "soft_oal.dll";
38+
private const string nativeLibName = "soft_oal";
3939

4040
/* typedef int ALenum; */
4141
public const int AL_NONE = 0x0000;
@@ -46,7 +46,7 @@ public static class AL10
4646

4747
public const int AL_CONE_INNER_ANGLE = 0x1001;
4848
public const int AL_CONE_OUTER_ANGLE = 0x1002;
49-
49+
5050
public const int AL_PITCH = 0x1003;
5151
public const int AL_POSITION = 0x1004;
5252
public const int AL_DIRECTION = 0x1005;

src/AL11.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace OpenAL
3535
{
3636
public static class AL11
3737
{
38-
private const string nativeLibName = "soft_oal.dll";
38+
private const string nativeLibName = "soft_oal";
3939

4040
/* typedef int ALenum; */
4141
public const int AL_SEC_OFFSET = 0x1024;

src/ALC10.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace OpenAL
3535
{
3636
public static class ALC10
3737
{
38-
private const string nativeLibName = "soft_oal.dll";
38+
private const string nativeLibName = "soft_oal";
3939

4040
/* typedef int ALenum; */
4141
public const int ALC_FALSE = 0x0000;

src/ALC11.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace OpenAL
3535
{
3636
public static class ALC11
3737
{
38-
private const string nativeLibName = "soft_oal.dll";
38+
private const string nativeLibName = "soft_oal";
3939

4040
/* typedef int ALenum */
4141
public const int ALC_MONO_SOURCES = 0x1010;

src/ALEXT.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace OpenAL
3535
{
3636
public static class ALEXT
3737
{
38-
private const string nativeLibName = "soft_oal.dll";
38+
private const string nativeLibName = "soft_oal";
3939

4040
/* TODO: All OpenAL Soft extensions! Complete as needed. */
4141

src/EFX.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace OpenAL
3535
{
3636
public static class EFX
3737
{
38-
private const string nativeLibName = "soft_oal.dll";
38+
private const string nativeLibName = "soft_oal";
3939

4040
/* typedef int ALenum; */
4141
public const int AL_METERS_PER_UNIT = 0x20004;

0 commit comments

Comments
 (0)