Skip to content

Commit

Permalink
Fix xrSound wont compile on Debug configuration
Browse files Browse the repository at this point in the history
Unexpected one! Sorry for this.
+ Small include path fixes
  • Loading branch information
Xottab-DUTY committed Mar 30, 2017
1 parent 1b5ce50 commit de7a634
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
1 change: 0 additions & 1 deletion src/xrSound/SoundRender_Core.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions src/xrSound/stdafx.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
#include <vorbis/vorbisfile.h>

#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
6 changes: 3 additions & 3 deletions src/xrSound/xrSound.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
</ClCompile>
<Link>
<AdditionalOptions>/NODEFAULTLIB:LIBCMTD %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;xrCDB.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Debug;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<MapExports>false</MapExports>
Expand Down Expand Up @@ -121,7 +121,7 @@
<WarningLevel>Level4</WarningLevel>
</ClCompile>
<Link>
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;xrCDB.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Expand Down Expand Up @@ -153,7 +153,7 @@
<WarningLevel>Level4</WarningLevel>
</ClCompile>
<Link>
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;xrCDB.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)Externals\libvorbis-1.2.3\win32\lib\$(Platform)\Release;$(SolutionDir)Externals\libogg-1.1.4\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem>
<LargeAddressAware>true</LargeAddressAware>
Expand Down

0 comments on commit de7a634

Please sign in to comment.