Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded predefined macro _ADNROID, because ndk build chain has already defined a macro named ANDROID

This commit is contained in:
minggo 2010-11-23 18:02:42 +08:00
parent 3eba79ec07
commit 59a986438f
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HelloWorld.android/jni/helloworld/Android.mk
View File

@ -7,7 +7,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../cocos2dx \
$(LOCAL_PATH)/../cocos2dx/include $(LOCAL_PATH)/../cocos2dx/include
LOCAL_LDLIBS := -L$(LOCAL_PATH)/../../libs/armeabi -lcocos2d -llog LOCAL_LDLIBS := -L$(LOCAL_PATH)/../../libs/armeabi -lcocos2d -llog
LOCAL_CPPFLAGS := -D_ANDROID
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

3
cocos2dx/Android.mk
View File

@ -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 -lpng \
-L$(LOCAL_PATH)/platform/android/third_party/libs -lxml2 \ -L$(LOCAL_PATH)/platform/android/third_party/libs -lxml2 \
-L$(LOCAL_PATH)/platform/android/third_party/libs -ljpeg -L$(LOCAL_PATH)/platform/android/third_party/libs -ljpeg
LOCAL_CPPFLAGS := -D_ANDROID
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

2
cocos2dx/platform/config_platform.h
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#define CCX_PLATFORM_UPHONE #define CCX_PLATFORM_UPHONE
#elif defined (WIN32) && defined (_WINDOWS) // under win32pc #elif defined (WIN32) && defined (_WINDOWS) // under win32pc
#define CCX_PLATFORM_WIN32 #define CCX_PLATFORM_WIN32
#elif defined (_ANDROID) #elif defined (ANDROID)
#define CCX_PLATFORM_ANDROID #define CCX_PLATFORM_ANDROID
#elif defined (TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR) #elif defined (TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR)
#define CCX_PLATFORM_IPHONE #define CCX_PLATFORM_IPHONE