Merge branch 'Saturn-Next' into Saturn-Testing

This commit is contained in:
Alug committed 2025-10-20 19:48:57 +02:00
commit 3cc86141c8
2 files changed
+10 -4

No files matched your search

+9 -3
View File
@@ -244,9 +244,8 @@ ifdef STATIC
libs+=-static
endif
ifeq ($(CC),gcc)
ifneq (,$(filter $(CC) $(CXX),gcc g++))
opts+=-mno-ms-bitfields
libs+=-mno-ms-bitfields
endif
# build with profiling information
@@ -279,7 +278,7 @@ opts+=-fsanitize=undefined
libs+=-fsanitize=undefined
endif
ifeq ($(CC),clang)
ifneq (,$(filter $(CC) $(CXX),clang clang++))
libs+=-fuse-ld=lld
endif
@@ -290,6 +289,13 @@ opts+=-g
libs+=-g
endif
ifdef MINGW
# mingw needs this passed AFTER lto and the likes were passed
# otherwise libbacktrace may break
opts+=-g
libs+=-g
endif
# debug_opts also get passed to windres
opts+=$(debug_opts)
+1 -1
View File
@@ -11889,7 +11889,7 @@ void P_SpawnHoops(mapthing_t *mthing)
z += P_GetSectorFloorZAt(sec, x, y);
hoopcenter->z -= hoopcenter->height/2;
hoopcenter->z = z - hoopcenter->height/2;
P_UnsetThingPosition(hoopcenter);
hoopcenter->x = x;