From d87f7593b8434f474627b99eac40ef21c1d0f6b4 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 8 Oct 2019 10:48:43 +0300 Subject: [PATCH] - fixed compilation of POSIX targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit src/posix/cocoa/i_main.mm:152:2: error: use of undeclared identifier 'ShutdownJoysticks' src/posix/sdl/i_system.cpp:128:3: error: ‘I_FatalError_Gtk’ was not declared in this scope src/posix/sdl/st_start.cpp:329:8: error: ‘CExitEvent’ was not declared in this scope --- src/posix/cocoa/i_main.mm | 1 - src/posix/sdl/i_system.cpp | 2 +- src/posix/sdl/st_start.cpp | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/posix/cocoa/i_main.mm b/src/posix/cocoa/i_main.mm index df47ede3a..97d53c97a 100644 --- a/src/posix/cocoa/i_main.mm +++ b/src/posix/cocoa/i_main.mm @@ -149,7 +149,6 @@ int OriginalMainTry(int argc, char** argv) progdir += "/"; auto ret = D_DoomMain(); - ShutdownJoysticks(); FConsoleWindow::DeleteInstance(); return ret; } diff --git a/src/posix/sdl/i_system.cpp b/src/posix/sdl/i_system.cpp index b18cd42c8..721cb9982 100644 --- a/src/posix/sdl/i_system.cpp +++ b/src/posix/sdl/i_system.cpp @@ -125,7 +125,7 @@ void Linux_I_FatalError(const char* errortext) #ifndef NO_GTK else if (I_GtkAvailable()) { - I_FatalError_Gtk(errortext); + I_ShowFatalError_Gtk(errortext); } #endif else diff --git a/src/posix/sdl/st_start.cpp b/src/posix/sdl/st_start.cpp index d213b26fd..7e673d961 100644 --- a/src/posix/sdl/st_start.cpp +++ b/src/posix/sdl/st_start.cpp @@ -42,6 +42,7 @@ #include "doomdef.h" #include "i_system.h" #include "c_cvars.h" +#include "doomerrors.h" // MACROS ------------------------------------------------------------------