dnesov/Voile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix fmod stuff xd

Browse Source
This commit is contained in:
ConfiG
2023-06-18 19:44:10 +03:00
parent 15747d7e9b
commit 072d3c9754
10 changed files with 83 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@@ -38,7 +38,6 @@ msbuild.wrn
# FMOD binaries (I cannot distribute them)
binaries/fmod/linux/*.so*
binaries/fmod/windows/*.dll
DaggerFramework.Fmod/runtimes/**/*
# !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
View 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
View File

0
DaggerFramework/libs/fmod/include/fmod_dsp.cs → DaggerFramework.Fmod/fmod_dsp.cs Executable file → Normal file
View File

0
DaggerFramework/libs/fmod/include/fmod_errors.cs → DaggerFramework.Fmod/fmod_errors.cs Executable file → Normal file
View File

0
DaggerFramework/libs/fmod/include/fmod_studio.cs → DaggerFramework.Fmod/fmod_studio.cs Executable file → Normal file
View File

13
DaggerFramework.sln
View File

@@ -7,6 +7,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestGame", "TestGame\TestGa
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DaggerFramework", "DaggerFramework\DaggerFramework.csproj", "{DA4FDEDC-AA81-4336-844F-562F9E763974}"
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
GlobalSection(SolutionConfigurationPlatforms) = preSolution
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}.Release|Any CPU.ActiveCfg = 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
EndGlobal

41
DaggerFramework/DaggerFramework.csproj
View File

@@ -1,26 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ImGui.NET" Version="1.89.4" />
<PackageReference Include="Raylib-cs" Version="4.2.0.1" />
<PackageReference Include="Silk.NET" Version="2.17.0" />
<PackageReference Include="StbImageSharp" Version="2.27.13" />
<PackageReference Include="StbVorbisSharp" Version="1.22.4" />
</ItemGroup>
<ItemGroup>
<Content Include="libs/fmod/bin/linux/*.*"
Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">
<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>
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DaggerFramework.Fmod" Version="1.0.0" />
<PackageReference Include="ImGui.NET" Version="1.89.4" />
<PackageReference Include="Raylib-cs" Version="4.2.0.1" />
<PackageReference Include="Silk.NET" Version="2.17.0" />
<PackageReference Include="StbImageSharp" Version="2.27.13" />
<PackageReference Include="StbVorbisSharp" Version="1.22.4" />
</ItemGroup>
</Project>

5
NuGet.config Normal file
View File

@@ -0,0 +1,5 @@
<configuration>
<packageSources>
<add key="DaggerFramework.Fmod Local" value="./DaggerFramework.Fmod/bin" />
</packageSources>
</configuration>

29
TestGame/TestGame.csproj
View File

@@ -1,13 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="../DaggerFramework/DaggerFramework.csproj" />
</ItemGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PublishAot>true</PublishAot>
<RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
</PropertyGroup>
</Project>
<ItemGroup>
<ProjectReference Include="../DaggerFramework/DaggerFramework.csproj" />
</ItemGroup>
<ItemGroup>
<Content Include="Resources/**">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>