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

Fix MSVC + Tools build

Browse source 
afxv_w32.h (apparently included indirectly viw edit_gui_common.h)
complained that windows.h (included indirectly via DebuggerServer.h
-> platform.h) was included first, apparently that's not allowed..

this was broken by the recent "fix mingw build" commit; now hopefully
both work (MinGW doesn't support building the tools, because they need MFC
which only works with MSVC)
This commit is contained in:
Daniel Gibson 2023-01-21 20:33:14 +01:00
parent dee76dbb21
commit 2de8c22f3b
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,12 +28,14 @@ If you have questions concerning this license or the applicable additional terms
=========================================================================== ===========================================================================
*/ */
#include "DebuggerServer.h"
#if defined( ID_ALLOW_TOOLS ) #if defined( ID_ALLOW_TOOLS )
#include "tools/edit_gui_common.h" #include "tools/edit_gui_common.h"
#include "DebuggerServer.h"
#include "DebuggerApp.h" #include "DebuggerApp.h"
#else #else
#include "DebuggerServer.h"
#include "debugger_common.h" #include "debugger_common.h"
// we need a lot to be able to list all threads in mars_city1 // we need a lot to be able to list all threads in mars_city1
const int MAX_MSGLEN = 8600; const int MAX_MSGLEN = 8600;

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

@ -26,13 +26,15 @@ If you have questions concerning this license or the applicable additional terms
=========================================================================== ===========================================================================
*/ */
#include "DebuggerServer.h"
#if defined( ID_ALLOW_TOOLS ) #if defined( ID_ALLOW_TOOLS )
#include "tools/edit_gui_common.h" #include "tools/edit_gui_common.h"
#include "DebuggerServer.h"
#include "../../sys/win32/rc/debugger_resource.h" #include "../../sys/win32/rc/debugger_resource.h"
#include "DebuggerApp.h" #include "DebuggerApp.h"
#else #else
#include "DebuggerServer.h"
#include "debugger_common.h" #include "debugger_common.h"
#endif #endif