fix fmod stuff xd
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -38,7 +38,6 @@ msbuild.wrn
|
|||||||
|
|
||||||
|
|
||||||
# FMOD binaries (I cannot distribute them)
|
# FMOD binaries (I cannot distribute them)
|
||||||
binaries/fmod/linux/*.so*
|
DaggerFramework.Fmod/runtimes/**/*
|
||||||
binaries/fmod/windows/*.dll
|
|
||||||
# !binaries/fmod/windows/WINDOWS_BINARIES_HERE
|
# !binaries/fmod/windows/WINDOWS_BINARIES_HERE
|
||||||
# !binaries/fmod/linux/LINUX_BINARIES_HERE
|
# !binaries/fmod/linux/LINUX_BINARIES_HERE
|
||||||
27
DaggerFramework.Fmod/DaggerFramework.Fmod.csproj
Normal file
27
DaggerFramework.Fmod/DaggerFramework.Fmod.csproj
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
|
<EnableDefaultItems>false</EnableDefaultItems>
|
||||||
|
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||||
|
<PackProject>true</PackProject>
|
||||||
|
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||||
|
<PackageOutputPath>bin/</PackageOutputPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="fmod.cs" />
|
||||||
|
<Compile Include="fmod_dsp.cs" />
|
||||||
|
<Compile Include="fmod_errors.cs" />
|
||||||
|
<Compile Include="fmod_studio.cs" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Content Include="runtimes/**" Link="runtimes/%(RecursiveDir)/%(Filename)%(Extension)">
|
||||||
|
<PackagePath>runtimes/</PackagePath>
|
||||||
|
<Pack>true</Pack>
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
0
DaggerFramework/libs/fmod/include/fmod.cs → DaggerFramework.Fmod/fmod.cs
Executable file → Normal file
0
DaggerFramework/libs/fmod/include/fmod.cs → DaggerFramework.Fmod/fmod.cs
Executable file → Normal file
0
DaggerFramework/libs/fmod/include/fmod_dsp.cs → DaggerFramework.Fmod/fmod_dsp.cs
Executable file → Normal file
0
DaggerFramework/libs/fmod/include/fmod_dsp.cs → DaggerFramework.Fmod/fmod_dsp.cs
Executable file → Normal file
0
DaggerFramework/libs/fmod/include/fmod_errors.cs → DaggerFramework.Fmod/fmod_errors.cs
Executable file → Normal file
0
DaggerFramework/libs/fmod/include/fmod_errors.cs → DaggerFramework.Fmod/fmod_errors.cs
Executable file → Normal file
0
DaggerFramework/libs/fmod/include/fmod_studio.cs → DaggerFramework.Fmod/fmod_studio.cs
Executable file → Normal file
0
DaggerFramework/libs/fmod/include/fmod_studio.cs → DaggerFramework.Fmod/fmod_studio.cs
Executable file → Normal file
@@ -7,6 +7,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestGame", "TestGame\TestGa
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DaggerFramework", "DaggerFramework\DaggerFramework.csproj", "{DA4FDEDC-AA81-4336-844F-562F9E763974}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DaggerFramework", "DaggerFramework\DaggerFramework.csproj", "{DA4FDEDC-AA81-4336-844F-562F9E763974}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DaggerFramework.Fmod", "DaggerFramework.Fmod\DaggerFramework.Fmod.csproj", "{50C6FEB4-8141-4B89-AF17-D0644576287F}"
|
||||||
|
EndProject
|
||||||
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Folder", "Solution Folder", "{EE70E84B-A471-4B5B-AE5B-B2712E6553EB}"
|
||||||
|
ProjectSection(SolutionItems) = preProject
|
||||||
|
.gitignore = .gitignore
|
||||||
|
README.md = README.md
|
||||||
|
NuGet.config = NuGet.config
|
||||||
|
EndProjectSection
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@@ -24,5 +33,9 @@ Global
|
|||||||
{DA4FDEDC-AA81-4336-844F-562F9E763974}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{DA4FDEDC-AA81-4336-844F-562F9E763974}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{DA4FDEDC-AA81-4336-844F-562F9E763974}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{DA4FDEDC-AA81-4336-844F-562F9E763974}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{DA4FDEDC-AA81-4336-844F-562F9E763974}.Release|Any CPU.Build.0 = Release|Any CPU
|
{DA4FDEDC-AA81-4336-844F-562F9E763974}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{50C6FEB4-8141-4B89-AF17-D0644576287F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{50C6FEB4-8141-4B89-AF17-D0644576287F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{50C6FEB4-8141-4B89-AF17-D0644576287F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{50C6FEB4-8141-4B89-AF17-D0644576287F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
|||||||
@@ -1,26 +1,19 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<PropertyGroup>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||||
<ItemGroup>
|
</PropertyGroup>
|
||||||
<PackageReference Include="ImGui.NET" Version="1.89.4" />
|
|
||||||
<PackageReference Include="Raylib-cs" Version="4.2.0.1" />
|
<ItemGroup>
|
||||||
<PackageReference Include="Silk.NET" Version="2.17.0" />
|
<PackageReference Include="DaggerFramework.Fmod" Version="1.0.0" />
|
||||||
<PackageReference Include="StbImageSharp" Version="2.27.13" />
|
<PackageReference Include="ImGui.NET" Version="1.89.4" />
|
||||||
<PackageReference Include="StbVorbisSharp" Version="1.22.4" />
|
<PackageReference Include="Raylib-cs" Version="4.2.0.1" />
|
||||||
</ItemGroup>
|
<PackageReference Include="Silk.NET" Version="2.17.0" />
|
||||||
<ItemGroup>
|
<PackageReference Include="StbImageSharp" Version="2.27.13" />
|
||||||
<Content Include="libs/fmod/bin/linux/*.*"
|
<PackageReference Include="StbVorbisSharp" Version="1.22.4" />
|
||||||
Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">
|
</ItemGroup>
|
||||||
<Link>%(Filename)%(Extension)</Link>
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Include="libs/fmod/bin/windows/*.*" Condition=" '$(OS)' == 'Windows_NT' ">
|
|
||||||
<Link>%(Filename)%(Extension)</Link>
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
</Project>
|
||||||
5
NuGet.config
Normal file
5
NuGet.config
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
<configuration>
|
||||||
|
<packageSources>
|
||||||
|
<add key="DaggerFramework.Fmod Local" value="./DaggerFramework.Fmod/bin" />
|
||||||
|
</packageSources>
|
||||||
|
</configuration>
|
||||||
@@ -1,13 +1,22 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
<PublishAot>true</PublishAot>
|
||||||
<ItemGroup>
|
<RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
|
||||||
<ProjectReference Include="../DaggerFramework/DaggerFramework.csproj" />
|
</PropertyGroup>
|
||||||
</ItemGroup>
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="../DaggerFramework/DaggerFramework.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Content Include="Resources/**">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
Reference in New Issue
Block a user