From 68a0ead5f0a7d4d64160c353702deec31fd31149 Mon Sep 17 00:00:00 2001 From: Mitchell Richters <48643140+mjr4077au@users.noreply.github.com> Date: Tue, 5 May 2020 17:45:21 +1000 Subject: [PATCH] - fix Linux builds following reset of master branch. (#44) * - fix Linux builds following reset of master branch. * - fix Linux Clang CI failure. * - change '#ifdef __linux__' to '#ifndef _WIN32' as requested/required. * - initialise batchrun in proper spot. --- source/build/include/osd.h | 1 - source/common/console/c_dispatch.cpp | 2 +- source/common/utility/cmdlib.cpp | 5 +++++ source/core/music/music.cpp | 2 +- source/platform/posix/i_system.h | 1 + source/platform/posix/sdl/hardware.cpp | 2 +- source/platform/posix/sdl/i_input.cpp | 4 ++-- source/platform/posix/sdl/i_joystick.cpp | 1 + source/platform/posix/sdl/i_main.cpp | 1 + source/platform/posix/sdl/st_start.cpp | 2 +- 10 files changed, 14 insertions(+), 7 deletions(-) diff --git a/source/build/include/osd.h b/source/build/include/osd.h index 49503840a..e66d4e396 100644 --- a/source/build/include/osd.h +++ b/source/build/include/osd.h @@ -11,7 +11,6 @@ #include "printf.h" #include "c_dispatch.h" -const char *OSD_StripColors(char *outBuf, const char *inBuf); #define OSDCMD_OK CCMD_OK diff --git a/source/common/console/c_dispatch.cpp b/source/common/console/c_dispatch.cpp index db1d6e25b..03f3ebd46 100644 --- a/source/common/console/c_dispatch.cpp +++ b/source/common/console/c_dispatch.cpp @@ -486,7 +486,7 @@ void FUnsafeConsoleCommand::Run(FCommandLine &args, int key) { if (UnsafeExecutionContext) { - Printf(TEXTCOLOR_RED "Cannot execute unsafe command " TEXTCOLOR_GOLD "%s\n", m_Name); + Printf(TEXTCOLOR_RED "Cannot execute unsafe command " TEXTCOLOR_GOLD "%s\n", m_Name.GetChars()); return; } diff --git a/source/common/utility/cmdlib.cpp b/source/common/utility/cmdlib.cpp index 2b14df653..f3b5a2226 100644 --- a/source/common/utility/cmdlib.cpp +++ b/source/common/utility/cmdlib.cpp @@ -39,6 +39,11 @@ #include "files.h" #include "md5.h" +#ifndef _WIN32 +#include +#include +#endif + #include #include #include diff --git a/source/core/music/music.cpp b/source/core/music/music.cpp index c8fce3237..8c08beb6c 100644 --- a/source/core/music/music.cpp +++ b/source/core/music/music.cpp @@ -87,7 +87,7 @@ FString G_SetupFilenameBasedMusic(const char* fn, const char* defmusic) test.Format("%s.%s", name.GetChars(), ext); if (FileExists(test)) return test; #ifdef __unix__ - test.Format("%s.%s", name.GetChars(), FString(ext.GetChars()).MakeLower().GetChars()); + test.Format("%s.%s", name.GetChars(), FString(ext).MakeLower().GetChars()); if (FileExists(test)) return test; #endif } diff --git a/source/platform/posix/i_system.h b/source/platform/posix/i_system.h index 9e3f7f7cb..8d1e6db16 100644 --- a/source/platform/posix/i_system.h +++ b/source/platform/posix/i_system.h @@ -81,6 +81,7 @@ inline int I_GetNumaNodeCount() { return 1; } inline int I_GetNumaNodeThreadCount(int numaNode) { return std::max(std::thread::hardware_concurrency(), 1); } inline void I_SetThreadNumaNode(std::thread &thread, int numaNode) { } +void I_PutInClipboard(const char* str); FString I_GetFromClipboard (bool use_primary_selection); #endif diff --git a/source/platform/posix/sdl/hardware.cpp b/source/platform/posix/sdl/hardware.cpp index 819eefd82..ea008169e 100644 --- a/source/platform/posix/sdl/hardware.cpp +++ b/source/platform/posix/sdl/hardware.cpp @@ -41,7 +41,7 @@ #include "v_text.h" #include "m_argv.h" #include "c_console.h" -#include "core/utility/printf.h" +#include "printf.h" IVideo *Video; diff --git a/source/platform/posix/sdl/i_input.cpp b/source/platform/posix/sdl/i_input.cpp index 118b53b58..ac64d7b2d 100644 --- a/source/platform/posix/sdl/i_input.cpp +++ b/source/platform/posix/sdl/i_input.cpp @@ -40,7 +40,7 @@ #include "c_dispatch.h" #include "dikeys.h" #include "utf8.h" -#include "core/console/keydef.h" +#include "keydef.h" #include "menu/menu.h" static void I_CheckNativeMouse (); @@ -261,7 +261,7 @@ void MessagePump (const SDL_Event &sev) switch (sev.type) { case SDL_QUIT: - throw ExitEvent(0); + throw CExitEvent(0); case SDL_WINDOWEVENT: extern void ProcessSDLWindowEvent(const SDL_WindowEvent &); diff --git a/source/platform/posix/sdl/i_joystick.cpp b/source/platform/posix/sdl/i_joystick.cpp index ad3416a10..9d5297ba0 100644 --- a/source/platform/posix/sdl/i_joystick.cpp +++ b/source/platform/posix/sdl/i_joystick.cpp @@ -33,6 +33,7 @@ #include #include "basics.h" +#include "cmdlib.h" #include "templates.h" #include "m_joy.h" #include "keydef.h" diff --git a/source/platform/posix/sdl/i_main.cpp b/source/platform/posix/sdl/i_main.cpp index e37828281..800171960 100644 --- a/source/platform/posix/sdl/i_main.cpp +++ b/source/platform/posix/sdl/i_main.cpp @@ -51,6 +51,7 @@ // MACROS ------------------------------------------------------------------ // TYPES ------------------------------------------------------------------- +bool batchrun; // EXTERNAL FUNCTION PROTOTYPES -------------------------------------------- diff --git a/source/platform/posix/sdl/st_start.cpp b/source/platform/posix/sdl/st_start.cpp index b6d2b6664..05893c078 100644 --- a/source/platform/posix/sdl/st_start.cpp +++ b/source/platform/posix/sdl/st_start.cpp @@ -326,5 +326,5 @@ bool FTTYStartupScreen::NetLoop(bool (*timer_callback)(void *), void *userdata) void ST_Endoom() { - throw ExitEvent(0); + throw CExitEvent(0); }