From 516c56a793386f9c107a1283ee56128ad9b4a24c Mon Sep 17 00:00:00 2001 From: folecr Date: Thu, 2 Feb 2012 20:04:29 -0800 Subject: [PATCH] Add EXPORT_C_INCLUDES and correct the paths to third party modules --- cocos2dx/Android.mk | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/cocos2dx/Android.mk b/cocos2dx/Android.mk index 1c90e2bcad..6c5ba7a6f1 100644 --- a/cocos2dx/Android.mk +++ b/cocos2dx/Android.mk @@ -106,6 +106,10 @@ tileMap_parallax_nodes/CCTileMapAtlas.cpp \ touch_dispatcher/CCTouchDispatcher.cpp \ touch_dispatcher/CCTouchHandler.cpp +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/ \ + $(LOCAL_PATH)/include \ + $(LOCAL_PATH)/platform + LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/platform @@ -123,6 +127,9 @@ LOCAL_CFLAGS := -DUSE_FILE32API include $(BUILD_SHARED_LIBRARY) -$(call import-module,platform/third_party/android/modules/libpng) -$(call import-module,platform/third_party/android/modules/libxml2) -$(call import-module,platform/third_party/android/modules/libjpeg) +# note that the import-module calls are relative to the parent directory +# this simplifies makefiles that use this module +# it requires only one entry in NDK_MODULE_PATH - the module search path +$(call import-module,cocos2dx/platform/third_party/android/modules/libpng) +$(call import-module,cocos2dx/platform/third_party/android/modules/libxml2) +$(call import-module,cocos2dx/platform/third_party/android/modules/libjpeg)