Merge branch 'next' into eggmine

This commit is contained in:
minenice55 2025-12-10 02:17:20 +01:00
commit fdd26b68b1
6 changed files with 15 additions and 1 deletions

View file

@ -503,6 +503,7 @@ target_compile_options(SRB2SDL2 PRIVATE
$<$<AND:$<COMPILE_LANGUAGE:C>,$<OR:$<C_COMPILER_ID:AppleClang>,$<C_COMPILER_ID:Clang>>>:
-Wall
-Wextra
-Wno-error=date-time
-Wno-absolute-value
-Wno-trigraphs
-Wno-error=non-literal-null-conversion
@ -515,6 +516,7 @@ target_compile_options(SRB2SDL2 PRIVATE
# C++, GNU, Clang and Apple Clang
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<OR:$<C_COMPILER_ID:GNU>,$<C_COMPILER_ID:AppleClang>,$<C_COMPILER_ID:Clang>>>:
-Wall
-Wno-error=date-time
-Wno-unused-function
-Wno-unused-but-set-variable
-Wno-unused-private-field

View file

@ -19,6 +19,7 @@
#include <cstring>
#include <functional>
#include <memory>
#include <istream>
//----------------------------------------------------------------------------|

View file

@ -2,6 +2,7 @@
#define __SRB2_CXXUTIL_HPP__
#include <cstdlib>
#include <cmath>
#include <type_traits>
#include <utility>

View file

@ -1083,7 +1083,8 @@ boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlen
else
netbuffer->ack = acknum;
netbuffer->packetindex = nodes[doomcom->remotenode].sendnum++;
if (node < MAXNETNODES)
netbuffer->packetindex = nodes[doomcom->remotenode].sendnum++;
netbuffer->checksum = NetbufferChecksum();
sendbytes += packetheaderlength + doomcom->datalength; // For stat

View file

@ -16,6 +16,7 @@ http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/n4820.pdf
#include <cstddef>
#include <cstdint>
#include <type_traits>
#include <exception>
#ifndef TCB_SPAN_NO_EXCEPTIONS
// Attempt to discover whether we're being compiled with exception support

8
toolchain/LinuxZig.cmake Normal file
View file

@ -0,0 +1,8 @@
# which compilers to use for C and C++
set(CMAKE_C_COMPILER zig cc)
set(CMAKE_CXX_COMPILER zig c++)
set(CMAKE_C_COMPILER_TARGET ${TARGET})
set(CMAKE_CXX_COMPILER_TARGET ${TARGET})
set(CMAKE_C_LINKER_DEPFILE_SUPPORTED FALSE)
set(CMAKE_CXX_LINKER_DEPFILE_SUPPORTED FALSE)