3ds: explicitly exclude music/gfx instead of add

fortheusers · Jun 12, 2024 · 7cbed99 · 7cbed99
1 parent ce3f288
commit 7cbed99
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/helpers/Makefile.3ds b/helpers/Makefile.3ds
@@ -18,6 +18,9 @@ BUILD     := build_3ds
 
 NO_SMDH := 1 # idk how this broke
 
+# remove some libs/flags not used yet on 3DS
+LIBS := $(filter-out -lSDL2_gfx -lSDL2_mixer,$(LIBS))
+CFLAGS := $(filter-out -DMUSIC,$(CFLAGS))
 
 #---------------------------------------------------------------------------------
 ifneq ($(BUILD),$(notdir $(CURDIR)))

diff --git a/helpers/Makefile.sdl2 b/helpers/Makefile.sdl2
@@ -5,10 +5,9 @@ ifeq (pc,$(MAKECMDGOALS))
 	endif
 endif
 
-LIBS    += -lSDL2_ttf -lSDL2_image -lmpg123 -lSDL2 -lSDL2main -lfreetype -lpng -lbz2 -ljpeg -lz
-CFLAGS  += -DSDL2
+LIBS    += -lSDL2_ttf -lSDL2_image -lSDL2_gfx -lSDL2_mixer -lmpg123 -lSDL2 -lSDL2main -lfreetype -lpng -lbz2 -ljpeg -lz
+CFLAGS  += -DSDL2 -DMUSIC
 
-ifneq (3ds,$(MAKECMDGOALS))
-	CFLAGS  += -DMUSIC
-	LIBS	+= -lSDL2_gfx -lSDL2_mixer
-endif
+$(info MAKECMDGOALS: $(MAKECMDGOALS))
+$(info CFLAGS: $(CFLAGS))
+$(info LIBS: $(LIBS))