From 59a986438f30b8211ab8c8186349bacb3bea78dd Mon Sep 17 00:00:00 2001 From: minggo Date: Tue, 23 Nov 2010 18:02:42 +0800 Subject: [PATCH] Remove unneeded predefined macro _ADNROID, because ndk build chain has already defined a macro named ANDROID --- HelloWorld.android/jni/helloworld/Android.mk | 3 +-- cocos2dx/Android.mk | 3 +-- cocos2dx/platform/config_platform.h | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/HelloWorld.android/jni/helloworld/Android.mk b/HelloWorld.android/jni/helloworld/Android.mk index 46b7d321c4..afb6e62f40 100644 --- a/HelloWorld.android/jni/helloworld/Android.mk +++ b/HelloWorld.android/jni/helloworld/Android.mk @@ -7,7 +7,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../cocos2dx \ $(LOCAL_PATH)/../cocos2dx/include LOCAL_LDLIBS := -L$(LOCAL_PATH)/../../libs/armeabi -lcocos2d -llog - -LOCAL_CPPFLAGS := -D_ANDROID + include $(BUILD_SHARED_LIBRARY) \ No newline at end of file diff --git a/cocos2dx/Android.mk b/cocos2dx/Android.mk index 1b479bd8a1..5a7c9fb25e 100644 --- a/cocos2dx/Android.mk +++ b/cocos2dx/Android.mk @@ -93,6 +93,5 @@ LOCAL_LDLIBS := -lGLESv1_CM -llog -lz -ljnigraphics\ -L$(LOCAL_PATH)/platform/android/third_party/libs -lpng \ -L$(LOCAL_PATH)/platform/android/third_party/libs -lxml2 \ -L$(LOCAL_PATH)/platform/android/third_party/libs -ljpeg - -LOCAL_CPPFLAGS := -D_ANDROID + include $(BUILD_SHARED_LIBRARY) \ No newline at end of file diff --git a/cocos2dx/platform/config_platform.h b/cocos2dx/platform/config_platform.h index fdb2d67e13..3e29b830a5 100644 --- a/cocos2dx/platform/config_platform.h +++ b/cocos2dx/platform/config_platform.h @@ -27,7 +27,7 @@ THE SOFTWARE. #define CCX_PLATFORM_UPHONE #elif defined (WIN32) && defined (_WINDOWS) // under win32pc #define CCX_PLATFORM_WIN32 -#elif defined (_ANDROID) +#elif defined (ANDROID) #define CCX_PLATFORM_ANDROID #elif defined (TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR) #define CCX_PLATFORM_IPHONE