More fixes to MIDI support in SDL_mixer, fixed crashing because of no native mouse cursor support on Android

This commit is contained in:
pelya
2010-11-15 18:26:21 +02:00
parent 988fa75f57
commit 524a1c1981
3 changed files with 14 additions and 2 deletions

View File

@@ -7,7 +7,8 @@ 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 -DUSE_TIMIDITY_MIDI
-DWAV_MUSIC -DOGG_USE_TREMOR -DOGG_MUSIC -DFLAC_MUSIC -DMOD_MUSIC \
-I$(LOCAL_PATH)/timidity -DMID_MUSIC -DUSE_TIMIDITY_MIDI
LOCAL_CPP_EXTENSION := .cpp
@@ -16,6 +17,8 @@ LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c)) $(addprefix timidity/
LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
LOCAL_STATIC_LIBRARIES := flac mikmod
LOCAL_LDLIBS := -llog
ifeq "$(TARGET_ARCH_ABI)" "armeabi"
LOCAL_CFLAGS += -DOGG_USE_TREMOR
LOCAL_STATIC_LIBRARIES += tremor