Skip to content
This repository was archived by the owner on Apr 1, 2026. It is now read-only.

Commit 1a88ea1

Browse files
committed
Align Makefile more with SA2
1 parent 4683766 commit 1a88ea1

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

Makefile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,8 @@ else
226226
CC1FLAGS += -Wno-parentheses-equality -Wno-unused-value
227227
CPPFLAGS += -D TITLE_BAR=$(BUILD_NAME).$(PLATFORM) -D PLATFORM_GBA=0 -D PLATFORM_SDL=1 -D PLATFORM_WIN32=0 $(shell sdl2-config --cflags)
228228
else ifeq ($(PLATFORM),sdl_win32)
229-
CC1FLAGS += -Wno-aggressive-loop-optimizations
230229
CPPFLAGS += -D TITLE_BAR=$(BUILD_NAME).$(PLATFORM) -D PLATFORM_GBA=0 -D PLATFORM_SDL=1 -D PLATFORM_WIN32=0 $(SDL_MINGW_FLAGS)
231230
else ifeq ($(PLATFORM),win32)
232-
# Without -Wno-aggressive-loop-optimizations, Drisame does not compile.
233-
CC1FLAGS += -Wno-aggressive-loop-optimizations
234231
CPPFLAGS += -D TITLE_BAR=$(BUILD_NAME).$(PLATFORM) -D PLATFORM_GBA=0 -D PLATFORM_SDL=0 -D PLATFORM_WIN32=1
235232
endif
236233

@@ -247,10 +244,6 @@ endif
247244
ifeq ($(PLATFORM),gba)
248245
ASFLAGS += -mcpu=arm7tdmi -mthumb-interwork
249246
CC1FLAGS += -mthumb-interwork
250-
ifeq ($(THUMB_SUPPORT),1)
251-
ASFLAGS += -mthumb-interwork
252-
CC1FLAGS += -mthumb-interwork
253-
endif
254247
else
255248
ifeq ($(PLATFORM), sdl)
256249
# for modern we are using a modern compiler
@@ -275,6 +268,12 @@ else
275268
CPPFLAGS += -D PORTABLE=0
276269
endif
277270

271+
ifeq ($(TAS_TESTING),1)
272+
CPPFLAGS += -D TAS_TESTING=1
273+
else
274+
CPPFLAGS += -D TAS_TESTING=0
275+
endif
276+
278277
ifeq ($(NON_MATCHING),1)
279278
# TODO: We use "#if(n)def NON_MATCHING a lot, maybe we should switch to "#if (!)NON_MATCHING"
280279
# CPPFLAGS += -D NON_MATCHING=1

0 commit comments

Comments
 (0)