From 2de8c22f3bb9f7dc04cc95810a3748d09e8797ee Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Sat, 21 Jan 2023 20:33:14 +0100 Subject: [PATCH] Fix MSVC + Tools build 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) --- neo/tools/debugger/DebuggerServer.cpp | 4 +++- neo/tools/debugger/debugger.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/neo/tools/debugger/DebuggerServer.cpp b/neo/tools/debugger/DebuggerServer.cpp index 319c7311..3b3adc7d 100644 --- a/neo/tools/debugger/DebuggerServer.cpp +++ b/neo/tools/debugger/DebuggerServer.cpp @@ -28,12 +28,14 @@ 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 "DebuggerServer.h" #include "DebuggerApp.h" #else +#include "DebuggerServer.h" #include "debugger_common.h" // we need a lot to be able to list all threads in mars_city1 const int MAX_MSGLEN = 8600; diff --git a/neo/tools/debugger/debugger.cpp b/neo/tools/debugger/debugger.cpp index dd6b6c3f..d9d47c05 100644 --- a/neo/tools/debugger/debugger.cpp +++ b/neo/tools/debugger/debugger.cpp @@ -26,13 +26,15 @@ 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 "DebuggerServer.h" #include "../../sys/win32/rc/debugger_resource.h" #include "DebuggerApp.h" #else +#include "DebuggerServer.h" #include "debugger_common.h" #endif