makefiles: remove MUSIC, introduce SIMPLE_SDL2

when defined, sdl_gfx and sdl_music are omitted when linking

Author: vgmoose

helpers/Makefile.3ds

@@ -19,8 +19,7 @@ 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))
+SIMPLE_SDL2 := 1
 
 #---------------------------------------------------------------------------------
 ifneq ($(BUILD),$(notdir $(CURDIR)))

helpers/Makefile.sdl2

@@ -5,7 +5,15 @@ ifeq (pc,$(MAKECMDGOALS))
 	endif
 endif
 
-LIBS    += -lSDL2_ttf -lSDL2_image -lSDL2_gfx -lSDL2_mixer -lmpg123 -lSDL2 -lSDL2main -lfreetype -lpng -lbz2 -ljpeg -lz
+ADV_LIBS := -lSDL2_gfx -lSDL2_mixer
+
+# check if SIMPLE_SDL2 is defined
+ifeq ($(SIMPLE_SDL2),1)
+	ADV_LIBS := 
+	CFLAGS += -DSIMPLE_SDL2
+endif
+
+LIBS    += -lSDL2_ttf -lSDL2_image $(ADV_LIBS) -lmpg123 -lSDL2 -lSDL2main -lfreetype -lpng -lbz2 -ljpeg -lz
 CFLAGS  += -DSDL2 -DMUSIC
 
 $(info MAKECMDGOALS: $(MAKECMDGOALS))

src/DrawUtils.cpp

@@ -73,7 +73,7 @@ void CST_DrawExit()
 	SDL_DestroyWindow(RootDisplay::mainDisplay->window);
 	SDL_QuitSubSystem(SDL_INIT_VIDEO);
 
-#ifdef MUSIC
+#ifndef SIMPLE_SDL2
 	auto root = RootDisplay::mainDisplay;
 	if (root->music != NULL)
 	{
@@ -92,7 +92,7 @@ void CST_DrawExit()
 
 void CST_MixerInit(RootDisplay* root)
 {
-#if defined(MUSIC)
+#if !defined(SIMPLE_SDL2)
 	Mix_Init(MIX_INIT_MP3);
 	if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 4096) != 0) {
 		printf("Failed to initialize SDL2 mixer: %s\n", Mix_GetError());
@@ -149,7 +149,7 @@ bool CST_SavePNG(CST_Texture* texture, const char* file_name)
 
 void CST_FadeInMusic(RootDisplay* root)
 {
-#if defined(MUSIC)
+#if !defined(SIMPLE_SDL2)
 	if (root->music)
 	{
 		Mix_VolumeMusic(0.85 *  MIX_MAX_VOLUME);
@@ -238,8 +238,8 @@ void CST_SetQualityHint(const char* quality)
 
 void CST_filledCircleRGBA(CST_Renderer* renderer, uint32_t x, uint32_t y, uint32_t radius, uint32_t r, uint32_t g, uint32_t b, uint32_t a)
 {
-	#if !defined(_3DS) && !defined(_3DS_MOCK)
-	// TODO: filledCircleRGBA needs to take a surface on 3DS
+	#if !defined(SIMPLE_SDL2)
+	// TODO: filledCircleRGBA needs to take a surface in SIMPLE_SDL2
 	filledCircleRGBA(renderer, x, y, radius, r, g, b, a);
 	#endif
 }
@@ -323,8 +323,8 @@ void CST_roundedBoxRGBA (
 	Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2,
 	Sint16 rad, Uint8 r, Uint8 g, Uint8 b, Uint8 a
 ) {
-	#if !defined(_3DS) && !defined(_3DS_MOCK)
-	// TODO: roundedBoxRGBA needs to take a surface on 3DS
+	#if !defined(SIMPLE_SDL2)
+	// TODO: roundedBoxRGBA needs to take a surface in SIMPLE_SDL2
 	roundedBoxRGBA(renderer, x1, y1, x2, y2, rad, r, g, b, a);
 	#endif
 }
@@ -334,8 +334,8 @@ void CST_roundedRectangleRGBA (
 	Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2,
 	Sint16 rad, Uint8 r, Uint8 g, Uint8 b, Uint8 a
 ) {
-	#if !defined(_3DS) && !defined(_3DS_MOCK)
-	// TODO: roundedRectangleRGBA needs to take a surface on 3DS
+	#if !defined(SIMPLE_SDL2)
+	// TODO: roundedRectangleRGBA needs to take a surface in SIMPLE_SDL2
 	roundedRectangleRGBA(renderer, x1, y1, x2, y2, rad, r, g, b, a);
 	#endif
 }
@@ -345,13 +345,13 @@ void CST_rectangleRGBA (
 	Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2,
 	Uint8 r, Uint8 g, Uint8 b, Uint8 a
 ) {
-	#if !defined(_3DS) && !defined(_3DS_MOCK)
-	// TODO: rectangleRGBA needs to take a surface on 3DS
+	#if !defined(SIMPLE_SDL2)
+	// TODO: rectangleRGBA needs to take a surface in SIMPLE_SDL2
 	rectangleRGBA(renderer, x1, y1, x2, y2, r, g, b, a);
 	#endif
 }
 
-#ifdef MUSIC
+#ifndef SIMPLE_SDL2
 
 // returns a size-3 vector of: (title, artist, album)
 std::vector<std::string> CST_GetMusicInfo(CST_Music* music) {

src/DrawUtils.hpp

@@ -4,15 +4,15 @@
 #include <SDL2/SDL_image.h>
 #include <SDL2/SDL_ttf.h>
 
-#if !defined(_3DS)
+#if !defined(SIMPLE_SDL2)
 #include <SDL2/SDL2_gfxPrimitives.h> // 3ds has no gfx library
 #endif
 
 #include "../libs/SDL_FontCache/SDL_FontCache.h"
 
 #include <string>
 
-#if defined(MUSIC)
+#if !defined(SIMPLE_SDL2)
 	#include <SDL2/SDL_mixer.h>
 	#include <mpg123.h>
 	typedef Mix_Music CST_Music;
@@ -88,7 +88,7 @@ void CST_SetWindowTitle(const char* title);
 void CST_SetCursor(int cursor);
 void CST_LowRumble(InputEvents* event, int ms);
 
-#ifdef MUSIC
+#ifndef SIMPLE_SDL2
 std::vector<std::string> CST_GetMusicInfo(CST_Music* music);
 #endif
 

src/Element.hpp.orig

@@ -64,7 +64,7 @@ class RootDisplay : public Element
 
 	void requestQuit();
 
-#if defined(MUSIC)
+#if !defined(SIMPLE_SDL2)
 	Mix_Music* music = NULL;
 #endif