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

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


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

diffstat:

 Android.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r a922956afe74 -r 8c0d97042815 Android.mk
--- a/Android.mk	Thu Sep 27 00:33:03 2018 -0700
+++ b/Android.mk	Thu Sep 27 00:35:32 2018 -0700
@@ -1,15 +1,15 @@
 # Save the local path
-my_LOCAL_PATH := $(call my-dir)
+SDL_TTF_LOCAL_PATH := $(call my-dir)
 
 FREETYPE_LIBRARY_PATH := external/freetype-2.4.12
 
 # Build freetype library
 ifneq ($(FREETYPE_LIBRARY_PATH),)
-    include $(my_LOCAL_PATH)/$(FREETYPE_LIBRARY_PATH)/Android.mk
+    include $(SDL_TTF_LOCAL_PATH)/$(FREETYPE_LIBRARY_PATH)/Android.mk
 endif
 
 # Restore local path
-LOCAL_PATH := $(my_LOCAL_PATH)
+LOCAL_PATH := $(SDL_TTF_LOCAL_PATH)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := SDL2_ttf


More information about the commits mailing list