From f0ca7fb2131f2c330cc84bf2e516e9fb4e3ead7f Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 12 Apr 2020 11:03:01 +0300 Subject: [PATCH] - fixed compilation of Linux targets --- src/d_main.cpp | 4 ++++ src/playsim/bots/b_game.cpp | 4 ++++ src/posix/sdl/i_input.cpp | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index cbd37addb..70a95aa05 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -113,6 +113,10 @@ #include "scriptutil.h" #include "v_palette.h" +#ifdef __unix__ +#include "i_system.h" // for SHARE_DIR +#endif // __unix__ + EXTERN_CVAR(Bool, hud_althud) EXTERN_CVAR(Int, vr_mode) EXTERN_CVAR(Bool, cl_customizeinvulmap) diff --git a/src/playsim/bots/b_game.cpp b/src/playsim/bots/b_game.cpp index 8810fd33b..a43c83ce0 100644 --- a/src/playsim/bots/b_game.cpp +++ b/src/playsim/bots/b_game.cpp @@ -94,6 +94,10 @@ Everything that is changed is marked (maybe commented) with "Added by MC" #include "vm.h" #include "g_levellocals.h" +#if !defined _WIN32 && !defined __APPLE__ +#include "i_system.h" // for SHARE_DIR +#endif // !_WIN32 && !__APPLE__ + static FRandom pr_botspawn ("BotSpawn"); cycle_t BotThinkCycles, BotSupportCycles; diff --git a/src/posix/sdl/i_input.cpp b/src/posix/sdl/i_input.cpp index e1f9ca75b..1cc685c8c 100644 --- a/src/posix/sdl/i_input.cpp +++ b/src/posix/sdl/i_input.cpp @@ -40,6 +40,7 @@ #include "d_main.h" #include "d_event.h" #include "d_gui.h" +#include "c_buttons.h" #include "c_console.h" #include "c_dispatch.h" #include "dikeys.h" @@ -191,7 +192,7 @@ static void I_CheckGUICapture () if (wantCapt != GUICapture) { GUICapture = wantCapt; - ResetButtonStates(); + buttonMap.ResetButtonStates(); } }