Added Timtidity in SDL_mixer to compilation

pelya · Nov 15, 2010 · 4d8cb16 · 4d8cb16
1 parent 8f512a3
commit 4d8cb16
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/project/jni/sdl_mixer/Android.mk b/project/jni/sdl_mixer/Android.mk
@@ -7,11 +7,11 @@ LOCAL_MODULE := sdl_mixer
 LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include \
 				-I$(LOCAL_PATH)/../mad/include -I$(LOCAL_PATH)/../flac/include -I$(LOCAL_PATH)/../ogg/include \
 				-I$(LOCAL_PATH)/../vorbis/include -I$(LOCAL_PATH)/../tremor/include -I$(LOCAL_PATH)/../mikmod/include \
-					-DWAV_MUSIC -DOGG_USE_TREMOR -DOGG_MUSIC -DFLAC_MUSIC -DMOD_MUSIC
+					-DWAV_MUSIC -DOGG_USE_TREMOR -DOGG_MUSIC -DFLAC_MUSIC -DMOD_MUSIC -DUSE_TIMIDITY_MIDI
 
 LOCAL_CPP_EXTENSION := .cpp
 
-LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
+LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c)) $(addprefix timidity/, $(notdir $(wildcard $(LOCAL_PATH)/timidity/*.c)))
 
 LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
 LOCAL_STATIC_LIBRARIES := flac mikmod

diff --git a/project/jni/sdl_mixer/timidity/config.h b/project/jni/sdl_mixer/timidity/config.h
@@ -176,6 +176,10 @@ typedef char int8;
 
 #if defined(__WIN32__) || defined(__OS2__)
 #define DEFAULT_PATH	"C:\\TIMIDITY"
+#elif defined(ANDROID)
+#define DEFAULT_PATH	"timidity"
+#define DEFAULT_PATH1	"/sdcard/timidity"
+#define DEFAULT_PATH2	"/sdcard/app-data/timidity"
 #else
 #define DEFAULT_PATH	"/etc/timidity"
 #define DEFAULT_PATH1	"/usr/share/timidity"