diff --git a/Assets/Plugins/gamecore/scarlett/fmod.dll b/Assets/Plugins/gamecore/scarlett/fmod.dll index 556ac65..859448d 100644 Binary files a/Assets/Plugins/gamecore/scarlett/fmod.dll and b/Assets/Plugins/gamecore/scarlett/fmod.dll differ diff --git a/Assets/Plugins/gamecore/scarlett/fmod.pdb b/Assets/Plugins/gamecore/scarlett/fmod.pdb deleted file mode 100644 index 16e0c6b..0000000 Binary files a/Assets/Plugins/gamecore/scarlett/fmod.pdb and /dev/null differ diff --git a/Assets/Plugins/gamecore/scarlett/fmod.pdb.meta b/Assets/Plugins/gamecore/scarlett/fmod.pdb.meta deleted file mode 100644 index 7ca3f5f..0000000 --- a/Assets/Plugins/gamecore/scarlett/fmod.pdb.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6b261958f64b2f049847a2a552c8a867 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/gamecore/scarlett/fmodL.dll b/Assets/Plugins/gamecore/scarlett/fmodL.dll index 1e7d537..8d48799 100644 Binary files a/Assets/Plugins/gamecore/scarlett/fmodL.dll and b/Assets/Plugins/gamecore/scarlett/fmodL.dll differ diff --git a/Assets/Plugins/gamecore/scarlett/fmodL.pdb b/Assets/Plugins/gamecore/scarlett/fmodL.pdb deleted file mode 100644 index 3c724b0..0000000 Binary files a/Assets/Plugins/gamecore/scarlett/fmodL.pdb and /dev/null differ diff --git a/Assets/Plugins/gamecore/scarlett/fmodL.pdb.meta b/Assets/Plugins/gamecore/scarlett/fmodL.pdb.meta deleted file mode 100644 index eca6fac..0000000 --- a/Assets/Plugins/gamecore/scarlett/fmodL.pdb.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 362467a871e822f42a483e7724421eb5 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/gamecore/xboxone/fmod.dll b/Assets/Plugins/gamecore/xboxone/fmod.dll index 7a10950..ec5a0b3 100644 Binary files a/Assets/Plugins/gamecore/xboxone/fmod.dll and b/Assets/Plugins/gamecore/xboxone/fmod.dll differ diff --git a/Assets/Plugins/gamecore/xboxone/fmod.pdb b/Assets/Plugins/gamecore/xboxone/fmod.pdb deleted file mode 100644 index cdf3fed..0000000 Binary files a/Assets/Plugins/gamecore/xboxone/fmod.pdb and /dev/null differ diff --git a/Assets/Plugins/gamecore/xboxone/fmod.pdb.meta b/Assets/Plugins/gamecore/xboxone/fmod.pdb.meta deleted file mode 100644 index db65c04..0000000 --- a/Assets/Plugins/gamecore/xboxone/fmod.pdb.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f44aa097462d1f744a2a2cc53f89ecc5 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/gamecore/xboxone/fmodL.dll b/Assets/Plugins/gamecore/xboxone/fmodL.dll index a29c746..71a720a 100644 Binary files a/Assets/Plugins/gamecore/xboxone/fmodL.dll and b/Assets/Plugins/gamecore/xboxone/fmodL.dll differ diff --git a/Assets/Plugins/gamecore/xboxone/fmodL.pdb b/Assets/Plugins/gamecore/xboxone/fmodL.pdb deleted file mode 100644 index cd0faf6..0000000 Binary files a/Assets/Plugins/gamecore/xboxone/fmodL.pdb and /dev/null differ diff --git a/Assets/Plugins/gamecore/xboxone/fmodL.pdb.meta b/Assets/Plugins/gamecore/xboxone/fmodL.pdb.meta deleted file mode 100644 index 87331e6..0000000 --- a/Assets/Plugins/gamecore/xboxone/fmodL.pdb.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3e131629dca279e4697e95d3d0a2abde -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/engine/FMOD/lib/scarlett/fmod.lib b/engine/FMOD/lib/scarlett/fmod.lib new file mode 100644 index 0000000..4a25f94 Binary files /dev/null and b/engine/FMOD/lib/scarlett/fmod.lib differ diff --git a/engine/FMOD/lib/scarlett/fmodL.lib b/engine/FMOD/lib/scarlett/fmodL.lib new file mode 100644 index 0000000..c61884e Binary files /dev/null and b/engine/FMOD/lib/scarlett/fmodL.lib differ diff --git a/engine/FMOD/lib/xboxone/fmod.lib b/engine/FMOD/lib/xboxone/fmod.lib new file mode 100644 index 0000000..4a25f94 Binary files /dev/null and b/engine/FMOD/lib/xboxone/fmod.lib differ diff --git a/engine/FMOD/lib/xboxone/fmodL.lib b/engine/FMOD/lib/xboxone/fmodL.lib new file mode 100644 index 0000000..c61884e Binary files /dev/null and b/engine/FMOD/lib/xboxone/fmodL.lib differ diff --git a/engine/Windows/VisualStudio/uniquake.vcxproj b/engine/Windows/VisualStudio/uniquake.vcxproj index ed669d3..a03f9cc 100644 --- a/engine/Windows/VisualStudio/uniquake.vcxproj +++ b/engine/Windows/VisualStudio/uniquake.vcxproj @@ -495,8 +495,7 @@ copy "$(SolutionDir)\..\SDL2\lib\*.dll" "$(TargetDir)" ..\..\UniQuake\stub;..\..\FMOD\inc;..\..\Quake;%(AdditionalIncludeDirectories) UNIQUAKE_EXPORTS;_DEBUG;USE_FMOD;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true - EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug Level3 @@ -504,9 +503,8 @@ copy "$(SolutionDir)\..\SDL2\lib\*.dll" "$(TargetDir)" CompileAsC - fmodL_vc.lib;%(AdditionalDependencies) - ..\..\FMOD\lib\gamecore\xboxone;%(AdditionalLibraryDirectories) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) + fmodL.lib;user32.lib;shell32.lib;kernel32.lib;$(Console_Libs);%(XboxExtensionsDependencies);%(AdditionalDependencies) + ..\..\FMOD\lib\xboxone;%(AdditionalLibraryDirectories) true Windows