dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2024-11-22 20:51:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix MinGW build, #505

Browse source 
<intrin.h>, included by SDL_cpuinfo.h via SDL.h, defines strcmp.
If the idlib/Str.h `#define strcmp idStr::Cmp` hack is visible when
that file is parsed, there's a compiler error (because strcmp in
intrin.h is replaced with idStr::Cmp then).
So I reorderedd includes a bit until it compiled again..
This commit is contained in:
Daniel Gibson 2023-01-16 03:09:34 +01:00
parent 477252308d
commit 07985cc5ea
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
neo/tools/debugger/DebuggerServer.cpp
View file

@ -28,6 +28,8 @@ If you have questions concerning this license or the applicable additional terms
===========================================================================
*/
#include "DebuggerServer.h"
#if defined( ID_ALLOW_TOOLS )
#include "tools/edit_gui_common.h"
#include "DebuggerApp.h"
@ -37,9 +39,6 @@ If you have questions concerning this license or the applicable additional terms
const int MAX_MSGLEN = 8600;
#endif
#include "DebuggerServer.h"
/*
================
rvDebuggerServer::rvDebuggerServer

7
neo/tools/debugger/DebuggerServer.h
View file

@ -28,13 +28,12 @@ If you have questions concerning this license or the applicable additional terms
#ifndef DEBUGGERSERVER_H_
#define DEBUGGERSERVER_H_
#include <SDL.h>
#include "sys/platform.h"
#include "idlib/Str.h"
#include "DebuggerMessages.h"
#include "DebuggerBreakpoint.h"
#include "framework/Game.h"
#include <SDL.h>
class function_t;
typedef struct prstack_s prstack_t;

4
neo/tools/debugger/debugger.cpp
View file

@ -26,6 +26,8 @@ If you have questions concerning this license or the applicable additional terms
===========================================================================
*/
#include "DebuggerServer.h"
#if defined( ID_ALLOW_TOOLS )
#include "tools/edit_gui_common.h"
#include "../../sys/win32/rc/debugger_resource.h"
@ -34,8 +36,6 @@ If you have questions concerning this license or the applicable additional terms
#include "debugger_common.h"
#endif
#include "DebuggerServer.h"
#if defined( ID_ALLOW_TOOLS )
rvDebuggerApp gDebuggerApp; // this is also used in other source files
static HWND gDebuggerWindow = NULL;