Replaced FMOD with JPOG's version of FMOD (3.61)

Fixed compile error
AdventureT · Dec 10, 2023 · eafb8fc · eafb8fc
1 parent 5369f96
commit eafb8fc
Show file tree

Hide file tree

Showing 27 changed files with 1,593 additions and 13,808 deletions.
diff --git a/OpenJPOG/premake5.lua b/OpenJPOG/premake5.lua
@@ -20,17 +20,24 @@ project ("OpenJPOG")
 	includedirs
 	{
 		"%{wks.location}/Toshi/Include",
+		"%{IncludeDir.fmod}"
 	}
 
 	defines
 	{
 		"TOSHI_USER_CLIENT"
 	}
 
+	libdirs
+	{
+		"%{LibDir.fmod}"
+	}
+
 	postbuildcommands
 	{
 		"{COPY} \"%{wks.location}bin/" .. outputdir .. "/TKernelInterface/TKernelInterface.dll\" \"%{wks.location}bin/" .. outputdir .. "/%{prj.name}\"",
 		"{COPY} \"%{wks.location}bin/" .. outputdir .. "/TApplication/TApplication.dll\" \"%{wks.location}bin/" .. outputdir .. "/%{prj.name}\"",
+		--"{COPY} \"%{wks.location}Toshi/vendor/fmod/fmod.dll\" \"%{wks.location}bin/" .. outputdir .. "/%{prj.name}\"",
 	}
 
 	filter "system:windows"

diff --git a/Toshi/Source/TKernel/TLString.cpp b/Toshi/Source/TKernel/TLString.cpp
@@ -2,4 +2,4 @@
 
 TOSHI_NAMESPACE_USING
 
-TFreeList TLocalisedString::m_oFreelist = TFreeList(sizeof(TLocalisedString), 0, 2000, (char*)"")
+TFreeList TLocalisedString::m_oFreelist = TFreeList(sizeof(TLocalisedString), 0, 2000, (char*)"");
diff --git a/Toshi/vendor/fmod/include/fmod.h b/Toshi/vendor/fmod/include/fmod.h
diff --git a/Toshi/vendor/fmod/include/fmod/core/fmod.h b/Toshi/vendor/fmod/include/fmod/core/fmod.h
diff --git a/Toshi/vendor/fmod/include/fmod/core/fmod.hpp b/Toshi/vendor/fmod/include/fmod/core/fmod.hpp
diff --git a/Toshi/vendor/fmod/include/fmod/core/fmod_codec.h b/Toshi/vendor/fmod/include/fmod/core/fmod_codec.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		TOSHI_NAMESPACE_USING

		TFreeList TLocalisedString::m_oFreelist = TFreeList(sizeof(TLocalisedString), 0, 2000, (char*)"")
		TFreeList TLocalisedString::m_oFreelist = TFreeList(sizeof(TLocalisedString), 0, 2000, (char*)"");