id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2024-12-03 09:22:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

More MinGW specific compile fixes.

Browse source
This commit is contained in:
Robert Beckebans 2012-12-01 17:41:45 +01:00 committed by Daniel Gibson
parent 8abb571fe7
commit b6dd24ec4e
4 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
neo/framework/FileSystem.cpp
View file

@ -3,6 +3,7 @@
Doom 3 BFG Edition GPL Source Code
Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company.
Copyright (C) 2012 Robert Beckebans
This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code").
@ -2681,7 +2682,9 @@ void idFileSystemLocal::CreateCRCsForResourceFileList( const idFileList& list )
std::auto_ptr<idFile> crcOutputFile( fileSystem->OpenFileWrite( crcFilename, "fs_basepath" ) );
if( crcOutputFile.get() == NULL )
{
idLib::Printf( "Error writing CRC file %s.\n", crcFilename );
// RB: fixed potential crash because of "cannot pass objects of non-trivially-copyable type 'class idStr' through '...'"
idLib::Printf( "Error writing CRC file %s.\n", crcFilename.c_str() );
// RB end
continue;
}

7
neo/idlib/sys/sys_includes.h
View file

@ -60,6 +60,13 @@ If you have questions concerning this license or the applicable additional terms
#else
// DG: MinGW is incompatible with the original dsound.h because it contains MSVC specific annotations
#include <wine-dsound.h>
// RB: was missing in MinGW/include/winuser.h
#ifndef MAPVK_VSC_TO_VK_EX
#define MAPVK_VSC_TO_VK_EX 3
#endif
// RB end
#endif

1
neo/sound/XAudio2/XA2_SoundHardware.cpp
View file

@ -3,6 +3,7 @@
Doom 3 BFG Edition GPL Source Code
Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company.
Copyright (C) 2012 Robert Beckebans
This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code").

3
neo/sound/XAudio2/XA2_SoundHardware.h
View file

@ -3,6 +3,7 @@
Doom 3 BFG Edition GPL Source Code
Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company.
Copyright (C) 2012 Robert Beckebans
This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code").
@ -30,6 +31,8 @@ If you have questions concerning this license or the applicable additional terms
class idSoundSample_XAudio2;
class idSoundVoice_XAudio2;
// RB
class idSoundHardware_XAudio2;
/*
================================================