diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-05-15 14:57:14 -0700 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-05-15 14:57:14 -0700 |
commit | 2c64c77deb4fdff28db859350fd4623f36d745b4 (patch) | |
tree | a190fe77966b14139e08595d1e3d18888cf49b59 /0001-Fix-build-with-gcc13.patch | |
parent | Updated to 2023-05-05-1323 (diff) | |
download | cataclysm-bn-2c64c77deb4fdff28db859350fd4623f36d745b4.tar.xz |
Updated to 2023-05-05-1323
Fix build with gcc13.
Diffstat (limited to '0001-Fix-build-with-gcc13.patch')
-rw-r--r-- | 0001-Fix-build-with-gcc13.patch | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/0001-Fix-build-with-gcc13.patch b/0001-Fix-build-with-gcc13.patch new file mode 100644 index 0000000..d4aacf6 --- /dev/null +++ b/0001-Fix-build-with-gcc13.patch @@ -0,0 +1,78 @@ +From f566ae0b4818e4f656711980c81cef45245f8e67 Mon Sep 17 00:00:00 2001 +From: aqua <aqua@iserlohn-fortress.net> +Date: Sun, 7 May 2023 09:37:40 +0300 +Subject: [PATCH] Fix build with gcc13 + +--- + CMakeLists.txt | 6 ++---- + src/hash_utils.h | 1 + + src/om_direction.h | 3 ++- + src/units_mass.h | 1 + + 4 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dfc1533d737..88783ece7a9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -219,7 +219,7 @@ IF(MSVC) + endif() + ELSE() + SET(CATA_WARNINGS +- "-Werror -Wall -Wextra \ ++ "-Wall -Wextra \ + -Wformat-signedness \ + -Wlogical-op \ + -Wmissing-declarations \ +@@ -230,9 +230,7 @@ ELSE() + -Wpedantic \ + -Wsuggest-override \ + -Wunused-macros \ +- -Wzero-as-null-pointer-constant \ +- -Wno-unknown-warning-option \ +- -Wno-range-loop-analysis") ++ -Wzero-as-null-pointer-constant") + IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES Windows) + SET(CATA_WARNINGS "${CATA_WARNINGS} -Wredundant-decls") + ENDIF() +diff --git a/src/hash_utils.h b/src/hash_utils.h +index 28241d1570a..1fa418ff518 100644 +--- a/src/hash_utils.h ++++ b/src/hash_utils.h +@@ -2,6 +2,7 @@ + #ifndef CATA_SRC_HASH_UTILS_H + #define CATA_SRC_HASH_UTILS_H + ++#include <cstdint> + #include <functional> + + // Support for hashing standard types. +diff --git a/src/om_direction.h b/src/om_direction.h +index 04c4d41d5c5..58c05da6894 100644 +--- a/src/om_direction.h ++++ b/src/om_direction.h +@@ -2,8 +2,9 @@ + #ifndef CATA_SRC_OM_DIRECTION_H + #define CATA_SRC_OM_DIRECTION_H + +-#include <climits> + #include <array> ++#include <climits> ++#include <cstdint> + #include <string> + + struct point; +diff --git a/src/units_mass.h b/src/units_mass.h +index abf7ee91d0c..2fe1880ba96 100644 +--- a/src/units_mass.h ++++ b/src/units_mass.h +@@ -3,6 +3,7 @@ + #define CATA_SRC_UNITS_MASS_H + + #include <algorithm> ++#include <cstdint> + + #include "units_def.h" + +-- +2.40.1 + |