-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
14 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 12 additions & 8 deletions
20
..._mixer/disable_modplug_mikmod_smpeg.patch → ...xer/toggle_modplug_mikmod_smpeg_ogg.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,29 @@ | ||
diff --git a/Android.mk b/Android.mk | ||
index 81c94b5..357500c 100644 | ||
--- a/Android.mk | ||
+++ b/Android.mk | ||
@@ -6,17 +6,17 @@ LOCAL_MODULE := SDL2_mixer | ||
--- orig/Android.mk 2016-01-03 07:15:57.000000000 +0100 | ||
+++ patch/Android.mk 2016-04-15 21:28:55.169697882 +0200 | ||
@@ -6,22 +6,22 @@ | ||
|
||
# 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 | ||
+SUPPORT_MOD_MODPLUG := false | ||
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 | ||
+SUPPORT_MOD_MIKMOD := false | ||
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 | ||
+SUPPORT_MP3_SMPEG := false | ||
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 | ||
|