Skip to content

Commit

Permalink
Don't conflict with cached local path if included in other Android.mk…
Browse files Browse the repository at this point in the history
… files
  • Loading branch information
slouken committed Sep 27, 2018
1 parent f963e5c commit 51a7b35
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Android.mk
@@ -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
Expand All @@ -19,22 +19,22 @@ WEBP_LIBRARY_PATH := external/libwebp-0.6.0

# 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)

Expand Down

0 comments on commit 51a7b35

Please sign in to comment.