From 5f65cdc3c0860ab414a177ef0eb3a2d271e446be Mon Sep 17 00:00:00 2001
From: minggo <ming@cocos2d-x.org>
Date: Fri, 18 Oct 2013 15:39:09 +0800
Subject: [PATCH] fix xcode compiling error and simplify android.mk

---
 .../cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id  | 2 +-
 cocos/2d/Android.mk                                        | 7 +------
 cocos/2d/platform/android/Android.mk                       | 2 +-
 external/png/prebuilt/android/Android.mk                   | 2 +-
 external/tiff/prebuilt/android/Android.mk                  | 2 +-
 external/webp/prebuilt/android/Android.mk                  | 2 +-
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
index e48cb4ba94..abe193af68 100644
--- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
@@ -1 +1 @@
-9fac2ba89faf5e6f3c870c02f5186641e6be1590
\ No newline at end of file
+a791b9789e080d3e7530890cfbaa966fffef5f9e
\ No newline at end of file
diff --git a/cocos/2d/Android.mk b/cocos/2d/Android.mk
index 7e60320ddb..ec9f2dbf6e 100644
--- a/cocos/2d/Android.mk
+++ b/cocos/2d/Android.mk
@@ -191,12 +191,7 @@ LOCAL_EXPORT_LDLIBS := -lGLESv2 \
                        -lz \
                        -landroid
 
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos_libpng_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos_jpeg_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos_libxml2_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos_libtiff_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos_libwebp_static
-LOCAL_WHOLE_STATIC_LIBRARIES += cocos_freetype2_static
+LOCAL_WHOLE_STATIC_LIBRARIES := cocos_freetype2_static
 LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
 
diff --git a/cocos/2d/platform/android/Android.mk b/cocos/2d/platform/android/Android.mk
index 2aca5c8ed3..db9bec71b9 100644
--- a/cocos/2d/platform/android/Android.mk
+++ b/cocos/2d/platform/android/Android.mk
@@ -42,7 +42,7 @@ LOCAL_EXPORT_LDLIBS := -lGLESv1_CM \
                        -lz \
                        -landroid
 
-LOCAL_WHOLE_STATIC_LIBRARIES	:= android_native_app_glue cocos_libpng_static cocos_jpeg_static cocos_libxml2_static cocos_libtiff_static cocos_libwebp_static
+LOCAL_WHOLE_STATIC_LIBRARIES	:= android_native_app_glue cocos_png_static cocos_jpeg_static cocos_tiff_static cocos_webp_static
 
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/external/png/prebuilt/android/Android.mk b/external/png/prebuilt/android/Android.mk
index 41a0f91322..457f97c57f 100644
--- a/external/png/prebuilt/android/Android.mk
+++ b/external/png/prebuilt/android/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := cocos_libpng_static
+LOCAL_MODULE := cocos_png_static
 LOCAL_MODULE_FILENAME := png
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libpng.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
diff --git a/external/tiff/prebuilt/android/Android.mk b/external/tiff/prebuilt/android/Android.mk
index 40af980160..417eeda4ad 100644
--- a/external/tiff/prebuilt/android/Android.mk
+++ b/external/tiff/prebuilt/android/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := cocos_libtiff_static
+LOCAL_MODULE := cocos_tiff_static
 LOCAL_MODULE_FILENAME := tiff
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libtiff.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
diff --git a/external/webp/prebuilt/android/Android.mk b/external/webp/prebuilt/android/Android.mk
index e102ac2511..1bd16f8c45 100644
--- a/external/webp/prebuilt/android/Android.mk
+++ b/external/webp/prebuilt/android/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := cocos_libwebp_static
+LOCAL_MODULE := cocos_webp_static
 LOCAL_MODULE_FILENAME := webp
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libwebp.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android