From b5eb8f47db623a9c4bedb423d7d2d775004d2c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= Date: Mon, 5 Feb 2024 02:06:28 +0100 Subject: [PATCH] GCC-13 support, when precompiled headers are off --- .github/workflows/continuous_integration.yml | 2 +- src/common/engine/palettecontainer.cpp | 1 + src/common/objects/autosegs.cpp | 1 + src/common/objects/autosegs.h | 1 + src/common/textures/bitmap.h | 1 + src/common/thirdparty/md5.h | 2 ++ src/common/utility/engineerrors.cpp | 3 ++- src/common/utility/palette.cpp | 2 ++ src/common/utility/writezip.cpp | 1 + src/common/widgets/netstartwindow.cpp | 1 + src/launcher/settingspage.h | 1 + 11 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index aa323c9399..51931cb288 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -44,7 +44,7 @@ jobs: - name: Linux GCC 12 os: ubuntu-22.04 - extra_options: -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 + extra_options: -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON deps_cmdline: sudo apt update && sudo apt install libsdl2-dev libvpx-dev libgtk-3-dev libwebp-dev build_type: MinSizeRel diff --git a/src/common/engine/palettecontainer.cpp b/src/common/engine/palettecontainer.cpp index 23d26f88fc..29ec3599ff 100644 --- a/src/common/engine/palettecontainer.cpp +++ b/src/common/engine/palettecontainer.cpp @@ -32,6 +32,7 @@ ** */ +#include #include "palutil.h" #include "sc_man.h" #include "m_crc32.h" diff --git a/src/common/objects/autosegs.cpp b/src/common/objects/autosegs.cpp index 11fce1005a..e9b3f935ff 100644 --- a/src/common/objects/autosegs.cpp +++ b/src/common/objects/autosegs.cpp @@ -42,6 +42,7 @@ ** compile with something other than Visual C++ or GCC. */ +#include #include "autosegs.h" #ifdef _WIN32 diff --git a/src/common/objects/autosegs.h b/src/common/objects/autosegs.h index 838553dd4b..e015ea9f58 100644 --- a/src/common/objects/autosegs.h +++ b/src/common/objects/autosegs.h @@ -36,6 +36,7 @@ #define AUTOSEGS_H #include +#include #if defined(__clang__) #if defined(__has_feature) && __has_feature(address_sanitizer) diff --git a/src/common/textures/bitmap.h b/src/common/textures/bitmap.h index 2828be356a..418f256c2b 100644 --- a/src/common/textures/bitmap.h +++ b/src/common/textures/bitmap.h @@ -36,6 +36,7 @@ #ifndef __BITMAP_H__ #define __BITMAP_H__ +#include #include "palentry.h" struct FCopyInfo; diff --git a/src/common/thirdparty/md5.h b/src/common/thirdparty/md5.h index f3aab94d96..95ac9a50d8 100644 --- a/src/common/thirdparty/md5.h +++ b/src/common/thirdparty/md5.h @@ -18,6 +18,8 @@ #ifndef MD5_H #define MD5_H +#include + struct MD5Context { MD5Context() { Init(); } diff --git a/src/common/utility/engineerrors.cpp b/src/common/utility/engineerrors.cpp index 41485778a2..05897b7862 100644 --- a/src/common/utility/engineerrors.cpp +++ b/src/common/utility/engineerrors.cpp @@ -35,8 +35,9 @@ bool gameisdead; -#ifdef _WIN32 #include + +#ifdef _WIN32 #include #include "zstring.h" void I_DebugPrint(const char *cp) diff --git a/src/common/utility/palette.cpp b/src/common/utility/palette.cpp index ea046a2209..03517c1ba5 100644 --- a/src/common/utility/palette.cpp +++ b/src/common/utility/palette.cpp @@ -33,6 +33,8 @@ */ #include +#include +#include #include "palutil.h" #include "palentry.h" #include "sc_man.h" diff --git a/src/common/utility/writezip.cpp b/src/common/utility/writezip.cpp index a6f6f9a276..2f3507e6f0 100644 --- a/src/common/utility/writezip.cpp +++ b/src/common/utility/writezip.cpp @@ -39,6 +39,7 @@ #include "files.h" #include "m_swap.h" #include "w_zip.h" +#include "fs_decompress.h" using FileSys::FCompressedBuffer; diff --git a/src/common/widgets/netstartwindow.cpp b/src/common/widgets/netstartwindow.cpp index c45f300988..69c83e5654 100644 --- a/src/common/widgets/netstartwindow.cpp +++ b/src/common/widgets/netstartwindow.cpp @@ -2,6 +2,7 @@ #include "netstartwindow.h" #include "version.h" #include "engineerrors.h" +#include "gstrings.h" #include #include #include diff --git a/src/launcher/settingspage.h b/src/launcher/settingspage.h index 5c07531942..a65f4f164f 100644 --- a/src/launcher/settingspage.h +++ b/src/launcher/settingspage.h @@ -1,6 +1,7 @@ #pragma once #include +#include "gstrings.h" #define RENDER_BACKENDS