From 072d3c97548555e87685f2f106cdb73f0c35a1cb Mon Sep 17 00:00:00 2001
From: ConfiG <cgytrus@cgyt.ru>
Date: Sun, 18 Jun 2023 19:44:10 +0300
Subject: [PATCH] fix fmod stuff xd

---
 .gitignore                                    |  5 +--
 .../DaggerFramework.Fmod.csproj               | 27 ++++++++++++
 .../include => DaggerFramework.Fmod}/fmod.cs  |  0
 .../fmod_dsp.cs                               |  0
 .../fmod_errors.cs                            |  0
 .../fmod_studio.cs                            |  0
 DaggerFramework.sln                           | 13 ++++++
 DaggerFramework/DaggerFramework.csproj        | 41 ++++++++-----------
 NuGet.config                                  |  5 +++
 TestGame/TestGame.csproj                      | 29 ++++++++-----
 10 files changed, 83 insertions(+), 37 deletions(-)
 create mode 100644 DaggerFramework.Fmod/DaggerFramework.Fmod.csproj
 rename {DaggerFramework/libs/fmod/include => DaggerFramework.Fmod}/fmod.cs (100%)
 mode change 100755 => 100644
 rename {DaggerFramework/libs/fmod/include => DaggerFramework.Fmod}/fmod_dsp.cs (100%)
 mode change 100755 => 100644
 rename {DaggerFramework/libs/fmod/include => DaggerFramework.Fmod}/fmod_errors.cs (100%)
 mode change 100755 => 100644
 rename {DaggerFramework/libs/fmod/include => DaggerFramework.Fmod}/fmod_studio.cs (100%)
 mode change 100755 => 100644
 create mode 100644 NuGet.config

diff --git a/.gitignore b/.gitignore
index ad800eb..9d0cdb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
\ No newline at end of file
+# !binaries/fmod/linux/LINUX_BINARIES_HERE
diff --git a/DaggerFramework.Fmod/DaggerFramework.Fmod.csproj b/DaggerFramework.Fmod/DaggerFramework.Fmod.csproj
new file mode 100644
index 0000000..83c7dee
--- /dev/null
+++ b/DaggerFramework.Fmod/DaggerFramework.Fmod.csproj
@@ -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>
diff --git a/DaggerFramework/libs/fmod/include/fmod.cs b/DaggerFramework.Fmod/fmod.cs
old mode 100755
new mode 100644
similarity index 100%
rename from DaggerFramework/libs/fmod/include/fmod.cs
rename to DaggerFramework.Fmod/fmod.cs
diff --git a/DaggerFramework/libs/fmod/include/fmod_dsp.cs b/DaggerFramework.Fmod/fmod_dsp.cs
old mode 100755
new mode 100644
similarity index 100%
rename from DaggerFramework/libs/fmod/include/fmod_dsp.cs
rename to DaggerFramework.Fmod/fmod_dsp.cs
diff --git a/DaggerFramework/libs/fmod/include/fmod_errors.cs b/DaggerFramework.Fmod/fmod_errors.cs
old mode 100755
new mode 100644
similarity index 100%
rename from DaggerFramework/libs/fmod/include/fmod_errors.cs
rename to DaggerFramework.Fmod/fmod_errors.cs
diff --git a/DaggerFramework/libs/fmod/include/fmod_studio.cs b/DaggerFramework.Fmod/fmod_studio.cs
old mode 100755
new mode 100644
similarity index 100%
rename from DaggerFramework/libs/fmod/include/fmod_studio.cs
rename to DaggerFramework.Fmod/fmod_studio.cs
diff --git a/DaggerFramework.sln b/DaggerFramework.sln
index 7898e5d..ddf0970 100644
--- a/DaggerFramework.sln
+++ b/DaggerFramework.sln
@@ -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
diff --git a/DaggerFramework/DaggerFramework.csproj b/DaggerFramework/DaggerFramework.csproj
index 62518c5..b357f57 100644
--- a/DaggerFramework/DaggerFramework.csproj
+++ b/DaggerFramework/DaggerFramework.csproj
@@ -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>
\ No newline at end of file
diff --git a/NuGet.config b/NuGet.config
new file mode 100644
index 0000000..31822a2
--- /dev/null
+++ b/NuGet.config
@@ -0,0 +1,5 @@
+<configuration>
+    <packageSources>
+        <add key="DaggerFramework.Fmod Local" value="./DaggerFramework.Fmod/bin" />
+    </packageSources>
+</configuration>
diff --git a/TestGame/TestGame.csproj b/TestGame/TestGame.csproj
index 42906bd..a23f452 100644
--- a/TestGame/TestGame.csproj
+++ b/TestGame/TestGame.csproj
@@ -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>
\ No newline at end of file
+    <ItemGroup>
+        <ProjectReference Include="../DaggerFramework/DaggerFramework.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Content Include="Resources/**">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>
+
+</Project>