Fixed bug 2490 - [PATCH] Fix options for android builds

Ben Boeckel Currently, to override the SUPPORT_* options, one must patch SDL_mixer's Android.mk to set them to false. This patch makes it so that the user may set the options in the top-level jni/Android.mk file without having to patch SDL_mixer.
libsdl-org · Apr 18, 2014 · 6426890 · 6426890
1 parent 145fdb1
commit 6426890
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Android.mk b/Android.mk
@@ -6,22 +6,22 @@ LOCAL_MODULE := SDL2_mixer
 
 # Enable this if you want to support loading MOD music via modplug
 # The library path should be a relative path to this directory.
-SUPPORT_MOD_MODPLUG := true
+SUPPORT_MOD_MODPLUG ?= true
 MODPLUG_LIBRARY_PATH := external/libmodplug-0.8.8.4
 
 # Enable this if you want to support loading MOD music via mikmod
 # The library path should be a relative path to this directory.
-SUPPORT_MOD_MIKMOD := true
+SUPPORT_MOD_MIKMOD ?= true
 MIKMOD_LIBRARY_PATH := external/libmikmod-3.1.12
 
 # Enable this if you want to support loading MP3 music via SMPEG
 # The library path should be a relative path to this directory.
-SUPPORT_MP3_SMPEG := true
+SUPPORT_MP3_SMPEG ?= true
 SMPEG_LIBRARY_PATH := external/smpeg2-2.0.0
 
 # Enable this if you want to support loading OGG Vorbis music via Tremor
 # The library path should be a relative path to this directory.
-SUPPORT_OGG := true
+SUPPORT_OGG ?= true
 OGG_LIBRARY_PATH := external/libogg-1.3.1
 VORBIS_LIBRARY_PATH := external/libvorbisidec-1.2.1