From 69089e0858170fecad52461cc663400aa3d881fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustaf=20Alh=C3=A4ll?= Date: Sat, 22 Jul 2023 22:47:52 +0200 Subject: [PATCH 1/4] Fix build errors when building without SDL --- src/dummy/i_video.c | 2 ++ src/hardware/Sourcefile | 1 - src/hardware/hw_model.c | 2 +- src/{hardware => }/u_list.c | 2 +- src/{hardware => }/u_list.h | 0 5 files changed, 4 insertions(+), 3 deletions(-) rename src/{hardware => }/u_list.c (99%) rename src/{hardware => }/u_list.h (100%) diff --git a/src/dummy/i_video.c b/src/dummy/i_video.c index 3b0a12a32..bb796b676 100644 --- a/src/dummy/i_video.c +++ b/src/dummy/i_video.c @@ -57,6 +57,8 @@ const char *VID_GetModeName(INT32 modenum) return NULL; } +UINT32 I_GetRefreshRate(void) { return 35; } + void I_UpdateNoBlit(void){} void I_FinishUpdate(void){} diff --git a/src/hardware/Sourcefile b/src/hardware/Sourcefile index 1c05de76c..6c374621d 100644 --- a/src/hardware/Sourcefile +++ b/src/hardware/Sourcefile @@ -8,6 +8,5 @@ hw_cache.c hw_md2load.c hw_md3load.c hw_model.c -u_list.c hw_batching.c r_opengl/r_opengl.c diff --git a/src/hardware/hw_model.c b/src/hardware/hw_model.c index 4ed03744b..b69bce0e2 100644 --- a/src/hardware/hw_model.c +++ b/src/hardware/hw_model.c @@ -15,7 +15,7 @@ #include "hw_md2load.h" #include "hw_md3load.h" #include "hw_md2.h" -#include "u_list.h" +#include "../u_list.h" #include static float PI = (3.1415926535897932384626433832795f); diff --git a/src/hardware/u_list.c b/src/u_list.c similarity index 99% rename from src/hardware/u_list.c rename to src/u_list.c index dc49a74e7..d5cfd5717 100644 --- a/src/hardware/u_list.c +++ b/src/u_list.c @@ -8,7 +8,7 @@ */ #include "u_list.h" -#include "../z_zone.h" +#include "z_zone.h" // Utility for managing // structures in a linked diff --git a/src/hardware/u_list.h b/src/u_list.h similarity index 100% rename from src/hardware/u_list.h rename to src/u_list.h From d42d1e9a45ff9bc5ac4bdcefa1297f92c198e90b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustaf=20Alh=C3=A4ll?= Date: Sat, 22 Jul 2023 22:56:17 +0200 Subject: [PATCH 2/4] fixup! Fix build errors when building without SDL --- src/Sourcefile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Sourcefile b/src/Sourcefile index fb08c2171..7c5305000 100644 --- a/src/Sourcefile +++ b/src/Sourcefile @@ -83,6 +83,7 @@ i_tcp.c lzf.c vid_copy.s b_bot.c +u_list.c lua_script.c lua_baselib.c lua_mathlib.c From 4bc7b2da1172f9a0142555c5c6d2ea5bdc7303cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustaf=20Alh=C3=A4ll?= Date: Sat, 22 Jul 2023 22:59:00 +0200 Subject: [PATCH 3/4] fixup! fixup! Fix build errors when building without SDL --- src/d_netcmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index b23aaa5a0..0f14a4965 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -49,7 +49,7 @@ #include "m_anigif.h" #include "md5.h" #include "m_perfstats.h" -#include "hardware/u_list.h" // TODO: this should be a standard utility class +#include "u_list.h" #ifdef NETGAME_DEVMODE #define CV_RESTRICT CV_NETVAR From 8bddf0f097a2886a5edf642acca3aa9ab304626d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustaf=20Alh=C3=A4ll?= Date: Mon, 24 Jul 2023 17:12:24 +0200 Subject: [PATCH 4/4] fixup! fixup! fixup! Fix build errors when building without SDL --- src/sdl/Srb2SDL-vc10.vcxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sdl/Srb2SDL-vc10.vcxproj b/src/sdl/Srb2SDL-vc10.vcxproj index c20265ed1..0b95cd0b2 100644 --- a/src/sdl/Srb2SDL-vc10.vcxproj +++ b/src/sdl/Srb2SDL-vc10.vcxproj @@ -259,7 +259,7 @@ - + @@ -424,7 +424,7 @@ - + @@ -556,4 +556,4 @@ - \ No newline at end of file +