From b0928f36013b2989fddaa0d8861c629353975443 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 1 Jan 2024 04:23:50 +0100 Subject: [PATCH 1/3] fix compiler error 127 seems like stuff for UPX aint even there or smth make: upx: No such file or directory make: [Makefile:610: ../bin/Mingw/Release/srb2kart-saturn.exe] Error 127 (ignored) --- src/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile b/src/Makefile index 06567753a..96cd6f413 100644 --- a/src/Makefile +++ b/src/Makefile @@ -102,6 +102,7 @@ ifeq ($(OS),Windows_NT) # all windows are Windows_NT... MINGW=1 SDL=1 WINDOWSHELL=1 + NOUPX=1 else # if you on the *nix From 5dd7e548c0e5ba11684d7389f7fe3c1fcd70534e Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 1 Jan 2024 16:22:30 +0100 Subject: [PATCH 2/3] fix warning in discord.c --- src/discord.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/discord.c b/src/discord.c index 4e574f05e..cd7dafa8f 100644 --- a/src/discord.c +++ b/src/discord.c @@ -47,7 +47,7 @@ struct discordInfo_s discordInfo; discordRequest_t *discordRequestList = NULL; -static char self_ip[IP_SIZE]; +static char self_ip[IP_SIZE+1]; boolean drpc_init = false; From ea6506f9f4e2a1fd320fa356f088e170d9ae8491 Mon Sep 17 00:00:00 2001 From: Indev Date: Mon, 1 Jan 2024 18:48:19 +0300 Subject: [PATCH 3/3] Remove attrpack from GLPatch_t so its alignment is same as for patch_t --- src/hardware/hw_data.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hardware/hw_data.h b/src/hardware/hw_data.h index 415358a35..daddc5025 100644 --- a/src/hardware/hw_data.h +++ b/src/hardware/hw_data.h @@ -111,7 +111,7 @@ struct GLPatch_s GLMipmap_t *mipmap; boolean notfound; // if the texture file was not found, mark it here (used in model texture loading) -} ATTRPACK; +}; typedef struct GLPatch_s GLPatch_t; #endif //_HWR_DATA_