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

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


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

diffstat:

 Android.mk |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r 32a18ca05935 -r 960662a9dbdc Android.mk
--- a/Android.mk	Wed Sep 26 15:19:34 2018 -0400
+++ b/Android.mk	Thu Sep 27 00:36:36 2018 -0700
@@ -1,4 +1,4 @@
-MY_LOCAL_PATH := $(call my-dir)
+SDL_IMAGE_LOCAL_PATH := $(call my-dir)
 
 
 # Enable this if you want to support loading JPEG images
@@ -19,22 +19,22 @@
 
 # Build the library
 ifeq ($(SUPPORT_JPG),true)
-    include $(MY_LOCAL_PATH)/$(JPG_LIBRARY_PATH)/Android.mk
+    include $(SDL_IMAGE_LOCAL_PATH)/$(JPG_LIBRARY_PATH)/Android.mk
 endif
 
 # Build the library
 ifeq ($(SUPPORT_PNG),true)
-    include $(MY_LOCAL_PATH)/$(PNG_LIBRARY_PATH)/Android.mk
+    include $(SDL_IMAGE_LOCAL_PATH)/$(PNG_LIBRARY_PATH)/Android.mk
 endif
 
 # Build the library
 ifeq ($(SUPPORT_WEBP),true)
-    include $(MY_LOCAL_PATH)/$(WEBP_LIBRARY_PATH)/Android.mk
+    include $(SDL_IMAGE_LOCAL_PATH)/$(WEBP_LIBRARY_PATH)/Android.mk
 endif
 
 
 # Restore local path
-LOCAL_PATH := $(MY_LOCAL_PATH)
+LOCAL_PATH := $(SDL_IMAGE_LOCAL_PATH)
 
 include $(CLEAR_VARS)
 


More information about the commits mailing list