[Commits] SDL_mixer: Don't conflict with cached local path if included in ...

libsdl.org revision control commits-owner at libsdl.org
Thu Sep 27 00:35:24 PDT 2018


details:   https://hg.libsdl.org/SDL_mixer/rev/fba113e1d189
changeset: 862:fba113e1d189
user:      Sam Lantinga <slouken at libsdl.org>
date:      Thu Sep 27 00:35:17 2018 -0700
description:
Don't conflict with cached local path if included in other Android.mk files

diffstat:

 Android.mk |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (51 lines):

diff -r 671a669e1065 -r fba113e1d189 Android.mk
--- a/Android.mk	Tue Aug 07 10:30:55 2018 +0300
+++ b/Android.mk	Thu Sep 27 00:35:17 2018 -0700
@@ -1,5 +1,5 @@
 # Save the local path
-MY_LOCAL_PATH := $(call my-dir)
+SDL_MIXER_LOCAL_PATH := $(call my-dir)
 
 
 # Enable this if you want to support loading FLAC music with libFLAC
@@ -26,33 +26,33 @@
 
 # Build the library
 ifeq ($(SUPPORT_FLAC),true)
-    include $(MY_LOCAL_PATH)/$(FLAC_LIBRARY_PATH)/Android.mk
+    include $(SDL_MIXER_LOCAL_PATH)/$(FLAC_LIBRARY_PATH)/Android.mk
 endif
 
 # Build the library
 ifeq ($(SUPPORT_OGG),true)
-    include $(MY_LOCAL_PATH)/$(OGG_LIBRARY_PATH)/Android.mk
-    include $(MY_LOCAL_PATH)/$(VORBIS_LIBRARY_PATH)/Android.mk
+    include $(SDL_MIXER_LOCAL_PATH)/$(OGG_LIBRARY_PATH)/Android.mk
+    include $(SDL_MIXER_LOCAL_PATH)/$(VORBIS_LIBRARY_PATH)/Android.mk
 endif
 
 # Build the library
 ifeq ($(SUPPORT_MP3_MPG123),true)
-    include $(MY_LOCAL_PATH)/$(MPG123_LIBRARY_PATH)/Android.mk
+    include $(SDL_MIXER_LOCAL_PATH)/$(MPG123_LIBRARY_PATH)/Android.mk
 endif
 
 # Build the library
 ifeq ($(SUPPORT_MOD_MODPLUG),true)
-    include $(MY_LOCAL_PATH)/$(MODPLUG_LIBRARY_PATH)/Android.mk
+    include $(SDL_MIXER_LOCAL_PATH)/$(MODPLUG_LIBRARY_PATH)/Android.mk
 endif
 
 # Build the library
 ifeq ($(SUPPORT_MID_TIMIDITY),true)
-    include $(MY_LOCAL_PATH)/$(TIMIDITY_LIBRARY_PATH)/Android.mk
+    include $(SDL_MIXER_LOCAL_PATH)/$(TIMIDITY_LIBRARY_PATH)/Android.mk
 endif
 
 
 # Restore local path
-LOCAL_PATH := $(MY_LOCAL_PATH)
+LOCAL_PATH := $(SDL_MIXER_LOCAL_PATH)
 
 include $(CLEAR_VARS)
 


More information about the commits mailing list