Skip to content

Commit

Permalink
Changed SUPPORT_TIMIDITY to SUPPORT_MID_TIMIDITY for consistency with…
Browse files Browse the repository at this point in the history
… other options
  • Loading branch information
slouken committed Oct 27, 2017
1 parent 83a1553 commit 7084fd6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Android.mk
Expand Up @@ -20,7 +20,7 @@ SUPPORT_MOD_MODPLUG ?= true
MODPLUG_LIBRARY_PATH := external/libmodplug-0.8.9.0

# Enable this if you want to support TiMidity
SUPPORT_TIMIDITY ?= true
SUPPORT_MID_TIMIDITY ?= true
TIMIDITY_LIBRARY_PATH := timidity


Expand All @@ -46,7 +46,7 @@ ifeq ($(SUPPORT_MOD_MODPLUG),true)
endif

# Build the library
ifeq ($(SUPPORT_TIMIDITY),true)
ifeq ($(SUPPORT_MID_TIMIDITY),true)
include $(MY_LOCAL_PATH)/$(TIMIDITY_LIBRARY_PATH)/Android.mk
endif

Expand Down Expand Up @@ -92,7 +92,7 @@ ifeq ($(SUPPORT_MOD_MODPLUG),true)
LOCAL_STATIC_LIBRARIES += modplug
endif

ifeq ($(SUPPORT_TIMIDITY),true)
ifeq ($(SUPPORT_MID_TIMIDITY),true)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(TIMIDITY_LIBRARY_PATH)
LOCAL_CFLAGS += -DMUSIC_MID_TIMIDITY
LOCAL_STATIC_LIBRARIES += timidity
Expand Down

0 comments on commit 7084fd6

Please sign in to comment.