This commit is contained in:
ConfiG
2023-06-18 21:43:29 +03:00
parent 0058f700c3
commit c0bdb3d4a6
5 changed files with 12 additions and 20 deletions

1
.gitignore vendored
View File

@@ -38,6 +38,7 @@ msbuild.wrn
# FMOD binaries (I cannot distribute them) # FMOD binaries (I cannot distribute them)
DaggerFramework.Fmod/*.nupkg
DaggerFramework.Fmod/runtimes/**/*.dll DaggerFramework.Fmod/runtimes/**/*.dll
DaggerFramework.Fmod/runtimes/**/*.so* DaggerFramework.Fmod/runtimes/**/*.so*
# !binaries/fmod/windows/WINDOWS_BINARIES_HERE # !binaries/fmod/windows/WINDOWS_BINARIES_HERE

View File

@@ -2,20 +2,13 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems> <Nullable>disable</Nullable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<PackProject>true</PackProject> <PackProject>true</PackProject>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageOutputPath>bin/</PackageOutputPath> <PackageOutputPath>./</PackageOutputPath>
<Version>0.2.2.8</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<Compile Include="fmod.cs" />
<Compile Include="fmod_dsp.cs" />
<Compile Include="fmod_errors.cs" />
<Compile Include="fmod_studio.cs" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="runtimes/**" Link="runtimes/%(RecursiveDir)/%(Filename)%(Extension)"> <Content Include="runtimes/**" Link="runtimes/%(RecursiveDir)/%(Filename)%(Extension)">
<PackagePath>runtimes/</PackagePath> <PackagePath>runtimes/</PackagePath>

View File

@@ -7,13 +7,10 @@ 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}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Folder", "Solution Folder", "{EE70E84B-A471-4B5B-AE5B-B2712E6553EB}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore .gitignore = .gitignore
README.md = README.md README.md = README.md
NuGet.config = NuGet.config
EndProjectSection EndProjectSection
EndProject EndProject
Global Global
@@ -33,9 +30,5 @@ 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

View File

@@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="DaggerFramework.Fmod" Version="1.0.0" /> <PackageReference Include="DaggerFramework.Fmod" Version="0.2.2.8" />
<PackageReference Include="ImGui.NET" Version="1.89.4" /> <PackageReference Include="ImGui.NET" Version="1.89.4" />
<PackageReference Include="Raylib-cs" Version="4.2.0.1" /> <PackageReference Include="Raylib-cs" Version="4.2.0.1" />
<PackageReference Include="Silk.NET" Version="2.17.0" /> <PackageReference Include="Silk.NET" Version="2.17.0" />
@@ -16,4 +16,8 @@
<PackageReference Include="StbVorbisSharp" Version="1.22.4" /> <PackageReference Include="StbVorbisSharp" Version="1.22.4" />
</ItemGroup> </ItemGroup>
<Target Name="BuildFmod" BeforeTargets="BeforeBuild">
<MSBuild Projects="../DaggerFramework.Fmod/DaggerFramework.Fmod.csproj" Targets="Restore;Build" />
</Target>
</Project> </Project>

View File

@@ -1,5 +1,6 @@
<configuration> <?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources> <packageSources>
<add key="DaggerFramework.Fmod Local" value="./DaggerFramework.Fmod/bin" /> <add key="FMOD Local" value=".\DaggerFramework.Fmod" />
</packageSources> </packageSources>
</configuration> </configuration>