Merge branch 'fix-no-sdl-build' into 'next'

Fix build errors when building without SDL

See merge request STJr/SRB2!2062
This commit is contained in:
Sal 2023-07-25 09:44:33 +00:00
commit ee67070547
8 changed files with 9 additions and 7 deletions

View file

@ -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

View file

@ -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

View file

@ -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){}

View file

@ -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

View file

@ -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 <string.h>
static float PI = (3.1415926535897932384626433832795f);

View file

@ -259,7 +259,7 @@
<ClInclude Include="..\hardware\hw_md2load.h" />
<ClInclude Include="..\hardware\hw_md3load.h" />
<ClInclude Include="..\hardware\hw_model.h" />
<ClInclude Include="..\hardware\u_list.h" />
<ClInclude Include="..\u_list.h" />
<ClInclude Include="..\hu_stuff.h" />
<ClInclude Include="..\info.h" />
<ClInclude Include="..\i_addrinfo.h" />
@ -424,7 +424,7 @@
<ClCompile Include="..\hardware\hw_md3load.c" />
<ClCompile Include="..\hardware\hw_model.c" />
<ClCompile Include="..\hardware\r_opengl\r_opengl.c" />
<ClCompile Include="..\hardware\u_list.c" />
<ClCompile Include="..\u_list.c" />
<ClCompile Include="..\hu_stuff.c" />
<ClCompile Include="..\info.c" />
<ClCompile Include="..\i_addrinfo.c">
@ -556,4 +556,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

View file

@ -8,7 +8,7 @@
*/
#include "u_list.h"
#include "../z_zone.h"
#include "z_zone.h"
// Utility for managing
// structures in a linked