From 6cc600cccec4e7f7992e099d53cb87100dbae9ba Mon Sep 17 00:00:00 2001
From: minggo <ming@cocos2d-x.org>
Date: Thu, 3 Jul 2014 11:43:56 +0800
Subject: [PATCH] fix compiling warnings

---
 cocos/Android.mk                             | 8 ++++----
 cocos/audio/android/Android.mk               | 3 ---
 cocos/editor-support/cocosbuilder/Android.mk | 2 --
 cocos/editor-support/cocostudio/Android.mk   | 4 ++--
 cocos/editor-support/spine/Android.mk        | 3 ---
 cocos/network/Android.mk                     | 2 --
 cocos/ui/Android.mk                          | 2 --
 7 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/cocos/Android.mk b/cocos/Android.mk
index ba6c634114..23cc18c905 100644
--- a/cocos/Android.mk
+++ b/cocos/Android.mk
@@ -227,10 +227,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
 
 # define the macro to compile through support/zip_support/ioapi.c
-LOCAL_CFLAGS   := -Wno-psabi  -DUSE_FILE32API
-LOCAL_CPPFLAGS := -Wno-literal-suffix -Wno-deprecated-declarations
-LOCAL_EXPORT_CFLAGS   := -Wno-psabi -DUSE_FILE32API
-LOCAL_EXPORT_CPPFLAGS := -Wno-literal-suffix -Wno-deprecated-declarations
+LOCAL_CFLAGS   :=  -DUSE_FILE32API
+LOCAL_CPPFLAGS := -Wno-deprecated-declarations
+LOCAL_EXPORT_CFLAGS   := -DUSE_FILE32API
+LOCAL_EXPORT_CPPFLAGS := -Wno-deprecated-declarations
 
 include $(BUILD_STATIC_LIBRARY)
 
diff --git a/cocos/audio/android/Android.mk b/cocos/audio/android/Android.mk
index e5f3261840..3854fa79d7 100644
--- a/cocos/audio/android/Android.mk
+++ b/cocos/audio/android/Android.mk
@@ -15,7 +15,4 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include \
                     $(LOCAL_PATH)/../.. \
                     $(LOCAL_PATH)/../../platform/android
 
-LOCAL_CFLAGS += -Wno-psabi
-LOCAL_EXPORT_CFLAGS += -Wno-psabi
-
 include $(BUILD_STATIC_LIBRARY)
diff --git a/cocos/editor-support/cocosbuilder/Android.mk b/cocos/editor-support/cocosbuilder/Android.mk
index 6cf80a9982..52863eda24 100644
--- a/cocos/editor-support/cocosbuilder/Android.mk
+++ b/cocos/editor-support/cocosbuilder/Android.mk
@@ -35,8 +35,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../2d \
 $(LOCAL_PATH) \
 $(LOCAL_PATH)/../../.. 
 
-LOCAL_CFLAGS += -Wno-psabi
-LOCAL_EXPORT_CFLAGS += -Wno-psabi
 
 LOCAL_WHOLE_STATIC_LIBRARIES := cocos_extension_static
 
diff --git a/cocos/editor-support/cocostudio/Android.mk b/cocos/editor-support/cocostudio/Android.mk
index 192f0e8f46..d5efa765b3 100644
--- a/cocos/editor-support/cocostudio/Android.mk
+++ b/cocos/editor-support/cocostudio/Android.mk
@@ -68,8 +68,8 @@ $(LOCAL_PATH)/../../../external \
 $(LOCAL_PATH)/.. \
 $(LOCAL_PATH)/../..
 
-LOCAL_CFLAGS += -Wno-psabi -fexceptions
-LOCAL_EXPORT_CFLAGS += -Wno-psabi
+LOCAL_CFLAGS += -fexceptions
+
 
 LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
diff --git a/cocos/editor-support/spine/Android.mk b/cocos/editor-support/spine/Android.mk
index 144623d03e..afdbad89a3 100644
--- a/cocos/editor-support/spine/Android.mk
+++ b/cocos/editor-support/spine/Android.mk
@@ -36,9 +36,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../.. \
 $(LOCAL_PATH)/..
 
-LOCAL_CFLAGS += -Wno-psabi
-LOCAL_EXPORT_CFLAGS += -Wno-psabi
-
 LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/cocos/network/Android.mk b/cocos/network/Android.mk
index 1cdd0d5480..045a8d5eab 100644
--- a/cocos/network/Android.mk
+++ b/cocos/network/Android.mk
@@ -15,8 +15,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../.. \
 $(LOCAL_PATH)/..
 
-LOCAL_CFLAGS += -Wno-psabi
-LOCAL_EXPORT_CFLAGS += -Wno-psabi
 
 LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_curl_static
diff --git a/cocos/ui/Android.mk b/cocos/ui/Android.mk
index 4c6e33334e..fed4a17385 100644
--- a/cocos/ui/Android.mk
+++ b/cocos/ui/Android.mk
@@ -41,8 +41,6 @@ $(LOCAL_PATH)/.. \
 $(LOCAL_PATH)/../.. \
 $(LOCAL_PATH)/../editor-support
 
-LOCAL_CFLAGS += -Wno-psabi
-LOCAL_EXPORT_CFLAGS += -Wno-psabi
 
 LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static