Skip to content

Commit 803b433

Browse files
committed
Patching in the right way
1 parent 874c92c commit 803b433

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed
Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
1-
diff -Naur SDL2_mixer/Android.mk SDL2_mixer-1/Android.mk
2-
--- SDL2_mixer/Android.mk 2019-03-07 21:07:42.149457400 +0100
3-
+++ SDL2_mixer-1/Android.mk 2019-03-07 21:05:06.851338800 +0100
4-
@@ -3,20 +3,20 @@
1+
--- orig/Android.mk 2018-10-31 15:58:59.000000000 +0100
2+
+++ patched/Android.mk 2019-03-08 12:11:35.271258500 +0100
3+
@@ -3,7 +3,7 @@
54

65

76
# Enable this if you want to support loading FLAC music with libFLAC
8-
-SUPPORT_FLAC := false
9-
+SUPPORT_FLAC ?= true
7+
-SUPPORT_FLAC ?= true
8+
+SUPPORT_FLAC := false
109
FLAC_LIBRARY_PATH := external/flac-1.3.2
1110

1211
# Enable this if you want to support loading OGG Vorbis music via Tremor
13-
-SUPPORT_OGG := true
14-
+SUPPORT_OGG ?= true
15-
OGG_LIBRARY_PATH := external/libogg-1.3.2
12+
@@ -12,11 +12,11 @@
1613
VORBIS_LIBRARY_PATH := external/libvorbisidec-1.2.1
1714

1815
# Enable this if you want to support loading MP3 music via MPG123
19-
-SUPPORT_MP3_MPG123 := false
20-
+SUPPORT_MP3_MPG123 ?= true
16+
-SUPPORT_MP3_MPG123 ?= true
17+
+SUPPORT_MP3_MPG123 := false
2118
MPG123_LIBRARY_PATH := external/mpg123-1.25.6
2219

2320
# Enable this if you want to support loading MOD music via modplug
24-
-SUPPORT_MOD_MODPLUG := false
25-
+SUPPORT_MOD_MODPLUG ?= true
21+
-SUPPORT_MOD_MODPLUG ?= true
22+
+SUPPORT_MOD_MODPLUG := false
2623
MODPLUG_LIBRARY_PATH := external/libmodplug-0.8.9.0
2724

2825
# Enable this if you want to support TiMidity

0 commit comments

Comments
 (0)