From 69b7dc4f82007b572674da040d3b43fda0dc3411 Mon Sep 17 00:00:00 2001 From: bitten2up Date: Sun, 9 Nov 2025 11:12:21 -0600 Subject: [PATCH 1/4] fix gcc15 issues --- Makefile | 2 +- src/game/enemies/drisame.c | 2 +- src/game/multiplayer/mode_select_2.c | 2 +- tools/_shared/arena_alloc/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ad27e311..5d339412 100644 --- a/Makefile +++ b/Makefile @@ -219,7 +219,7 @@ endif # BUILD_NAME == sa1 else CC1FLAGS += -Wstrict-overflow=1 ifeq ($(PLATFORM),sdl) - CC1FLAGS += -Wno-parentheses-equality -Wno-unused-value + CC1FLAGS += -Wno-parentheses-equality -Wno-unused-value -Wno-incompatible-pointer-types CPPFLAGS += -D TITLE_BAR=$(BUILD_NAME).$(PLATFORM) -D PLATFORM_GBA=0 -D PLATFORM_SDL=1 -D PLATFORM_WIN32=0 $(shell sdl2-config --cflags) else ifeq ($(PLATFORM),sdl_win32) CC1FLAGS += -Wno-aggressive-loop-optimizations diff --git a/src/game/enemies/drisame.c b/src/game/enemies/drisame.c index 453a3d4c..09835156 100644 --- a/src/game/enemies/drisame.c +++ b/src/game/enemies/drisame.c @@ -405,4 +405,4 @@ void TaskDestructor_IceBlock(struct Task *t) VramFree(iceBlock->s.graphics.dest); VramFree(iceBlock->s2.graphics.dest); VramFree(iceBlock->s3.graphics.dest); -} \ No newline at end of file +} diff --git a/src/game/multiplayer/mode_select_2.c b/src/game/multiplayer/mode_select_2.c index 6b8b3ebc..d488d02c 100644 --- a/src/game/multiplayer/mode_select_2.c +++ b/src/game/multiplayer/mode_select_2.c @@ -389,4 +389,4 @@ void sub_8010060(void) SA2_LABEL(gUnknown_03002280)[0][2] = -1; SA2_LABEL(gUnknown_03002280)[0][3] = 0x20; } -} \ No newline at end of file +} diff --git a/tools/_shared/arena_alloc/Makefile b/tools/_shared/arena_alloc/Makefile index 60ecedab..344a6da3 100644 --- a/tools/_shared/arena_alloc/Makefile +++ b/tools/_shared/arena_alloc/Makefile @@ -9,7 +9,7 @@ all: libarena_alloc.a @: %.o: $(SOURCE) - $(CC) -O2 $(SOURCE) -static -c $< $(LDFLAGS) + $(CC) -O2 $(SOURCE) -static -std=c11 -c $< $(LDFLAGS) libarena_alloc.a: arena_alloc.o $(AR) -rcs $@ $< From 3dcc24127799bafd7760db7a1d5b126d2ba9eb29 Mon Sep 17 00:00:00 2001 From: bitten2up Date: Sun, 9 Nov 2025 11:28:10 -0600 Subject: [PATCH 2/4] oops need gnu11 --- tools/_shared/arena_alloc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/_shared/arena_alloc/Makefile b/tools/_shared/arena_alloc/Makefile index 344a6da3..568c024f 100644 --- a/tools/_shared/arena_alloc/Makefile +++ b/tools/_shared/arena_alloc/Makefile @@ -9,7 +9,7 @@ all: libarena_alloc.a @: %.o: $(SOURCE) - $(CC) -O2 $(SOURCE) -static -std=c11 -c $< $(LDFLAGS) + $(CC) -O2 $(SOURCE) -static -std=gnu11 -c $< $(LDFLAGS) libarena_alloc.a: arena_alloc.o $(AR) -rcs $@ $< From c36c4c577768030788ce0ff5ea73409968b4c82d Mon Sep 17 00:00:00 2001 From: bitten2up Date: Sun, 9 Nov 2025 13:42:15 -0600 Subject: [PATCH 3/4] move -std=gnu11 --- tools/_shared/arena_alloc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/_shared/arena_alloc/Makefile b/tools/_shared/arena_alloc/Makefile index 568c024f..bfbc2bcb 100644 --- a/tools/_shared/arena_alloc/Makefile +++ b/tools/_shared/arena_alloc/Makefile @@ -9,7 +9,7 @@ all: libarena_alloc.a @: %.o: $(SOURCE) - $(CC) -O2 $(SOURCE) -static -std=gnu11 -c $< $(LDFLAGS) + $(CC) -O2 -std=gnu11 $(SOURCE) -static -c $< $(LDFLAGS) libarena_alloc.a: arena_alloc.o $(AR) -rcs $@ $< From 0d99b9d395682ea7eef40477afaf95a32dd416e4 Mon Sep 17 00:00:00 2001 From: bitten2up Date: Mon, 17 Nov 2025 19:40:43 -0600 Subject: [PATCH 4/4] here jace --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5d339412..ad27e311 100644 --- a/Makefile +++ b/Makefile @@ -219,7 +219,7 @@ endif # BUILD_NAME == sa1 else CC1FLAGS += -Wstrict-overflow=1 ifeq ($(PLATFORM),sdl) - CC1FLAGS += -Wno-parentheses-equality -Wno-unused-value -Wno-incompatible-pointer-types + CC1FLAGS += -Wno-parentheses-equality -Wno-unused-value CPPFLAGS += -D TITLE_BAR=$(BUILD_NAME).$(PLATFORM) -D PLATFORM_GBA=0 -D PLATFORM_SDL=1 -D PLATFORM_WIN32=0 $(shell sdl2-config --cflags) else ifeq ($(PLATFORM),sdl_win32) CC1FLAGS += -Wno-aggressive-loop-optimizations