From de7a634c595308233606c9bf28700bd0ed0f9ed9 Mon Sep 17 00:00:00 2001 From: Xottab-DUTY Date: Thu, 30 Mar 2017 20:37:46 +0500 Subject: [PATCH] Fix xrSound wont compile on Debug configuration Unexpected one! Sorry for this. + Small include path fixes --- src/xrSound/SoundRender_Core.h | 1 - src/xrSound/stdafx.h | 4 ++-- src/xrSound/xrSound.vcxproj | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/xrSound/SoundRender_Core.h b/src/xrSound/SoundRender_Core.h index 714bb0386bb..dce72694082 100644 --- a/src/xrSound/SoundRender_Core.h +++ b/src/xrSound/SoundRender_Core.h @@ -5,7 +5,6 @@ #include "SoundRender.h" #include "SoundRender_Environment.h" #include "SoundRender_Cache.h" -#include "soundrender_environment.h" class CSoundRender_Core : public CSound_manager_interface { diff --git a/src/xrSound/stdafx.h b/src/xrSound/stdafx.h index c29bed15d4d..90e4b701dc9 100644 --- a/src/xrSound/stdafx.h +++ b/src/xrSound/stdafx.h @@ -28,14 +28,14 @@ #include #include "xrCDB/xrCDB.h" -#include "sound.h" +#include "Sound.h" #undef ENGINE_API #include "xrCore/xr_resource.h" #ifdef _EDITOR -#include "ETools.h" +#include "utils/ETools/ETools.h" #endif // TODO: reference additional headers your program requires here #endif diff --git a/src/xrSound/xrSound.vcxproj b/src/xrSound/xrSound.vcxproj index eb18f194204..f7ca1733e0e 100644 --- a/src/xrSound/xrSound.vcxproj +++ b/src/xrSound/xrSound.vcxproj @@ -88,7 +88,7 @@ /NODEFAULTLIB:LIBCMTD %(AdditionalOptions) - libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;%(AdditionalDependencies) + libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;xrCDB.lib;%(AdditionalDependencies) true $(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Debug;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Debug;%(AdditionalLibraryDirectories) false @@ -121,7 +121,7 @@ Level4 - libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;%(AdditionalDependencies) + libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;xrCDB.lib;%(AdditionalDependencies) $(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories) Windows true @@ -153,7 +153,7 @@ Level4 - libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;%(AdditionalDependencies) + libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;xrCDB.lib;%(AdditionalDependencies) $(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories) Windows true