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

[android] fixed #477: set default ndk version to ndk-r5

This commit is contained in:
minggo 2011-04-29 09:59:05 +08:00
parent b61c019b2c
commit bb4fc1c446
5 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HelloWorld/android/build_native.sh
View File

@ -1,5 +1,5 @@
# set params # set params
ANDROID_NDK_ROOT=/cygdrive/e/android-ndk-r4-crystax ANDROID_NDK_ROOT=/cygdrive/e/android-ndk-r5
COCOS2DX_ROOT=/cygdrive/d/Work7/cocos2d-x COCOS2DX_ROOT=/cygdrive/d/Work7/cocos2d-x
HELLOWORLD_ROOT=$COCOS2DX_ROOT/HelloWorld/android HELLOWORLD_ROOT=$COCOS2DX_ROOT/HelloWorld/android

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

@ -11,15 +11,18 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../cocos2dx \
$(LOCAL_PATH)/../../../../cocos2dx/include \ $(LOCAL_PATH)/../../../../cocos2dx/include \
$(LOCAL_PATH)/../../../../CocosDenshion/include \ $(LOCAL_PATH)/../../../../CocosDenshion/include \
$(LOCAL_PATH)/../../.. $(LOCAL_PATH)/../../..
LOCAL_LDLIBS := -L$(LOCAL_PATH)/../../libs/armeabi -lcocos2d -llog -lcocosdenshion \
-L$(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/libraries -lcurl
# it is used for ndk-r5 # it is used for ndk-r4
# if you build with nkd-r4, uncomment it
# LOCAL_LDLIBS := -L$(LOCAL_PATH)/../../libs/armeabi -lcocos2d -llog -lcocosdenshion \
# -L$(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/libraries -lcurl
# it is used for ndk-r5
# if you build with ndk-r4, comment it
# because the new Windows toolchain doesn't support Cygwin's drive # because the new Windows toolchain doesn't support Cygwin's drive
# mapping (i.e /cygdrive/c/ instead of C:/) # mapping (i.e /cygdrive/c/ instead of C:/)
# LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../../libs/armeabi) \ LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../../libs/armeabi) \
# -lcocos2d -llog -lcocosdenshion \ -lcocos2d -llog -lcocosdenshion \
# -L$(call host-path, $(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/libraries) -lcurl -L$(call host-path, $(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/libraries) -lcurl
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

30
cocos2dx/Android.mk
View File

@ -117,23 +117,25 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \
$(LOCAL_PATH)/platform/third_party/android/skia/views \ $(LOCAL_PATH)/platform/third_party/android/skia/views \
$(LOCAL_PATH)/platform/third_party/android/skia/xml $(LOCAL_PATH)/platform/third_party/android/skia/xml
#it is used for ndk-r4 # it is used for ndk-r4
LOCAL_LDLIBS := -L$(LOCAL_PATH)/platform/third_party/android/libraries \ # if you build with nkd-r4, uncomment it
-lGLESv1_CM -llog -lz \ # LOCAL_LDLIBS := -L$(LOCAL_PATH)/platform/third_party/android/libraries \
-lpng \ # -lGLESv1_CM -llog -lz \
-lxml2 \ # -lpng \
-ljpeg \ # -lxml2 \
-lskia # -ljpeg \
# -lskia
# it is used for ndk-r5 # it is used for ndk-r5
# if you build with ndk-r4, comment it
# because the new Windows toolchain doesn't support Cygwin's drive # because the new Windows toolchain doesn't support Cygwin's drive
# mapping (i.e /cygdrive/c/ instead of C:/) # mapping (i.e /cygdrive/c/ instead of C:/)
# LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/platform/third_party/android/libraries) \ LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/platform/third_party/android/libraries) \
# -lGLESv1_CM -llog -lz \ -lGLESv1_CM -llog -lz \
# -lpng \ -lpng \
# -lxml2 \ -lxml2 \
# -ljpeg \ -ljpeg \
# -lskia -lskia
# define the macro to compile through support/zip_support/ioapi.c # define the macro to compile through support/zip_support/ioapi.c
LOCAL_CFLAGS := -DUSE_FILE32API LOCAL_CFLAGS := -DUSE_FILE32API

2
tests/test.android/build_native.sh
View File

@ -1,5 +1,5 @@
# set params # set params
ANDROID_NDK_ROOT=/cygdrive/e/android-ndk-r4-crystax ANDROID_NDK_ROOT=/cygdrive/e/android-ndk-r5
COCOS2DX_ROOT=/cygdrive/d/Work7/cocos2d-x COCOS2DX_ROOT=/cygdrive/d/Work7/cocos2d-x
TESTS_ROOT=$COCOS2DX_ROOT/tests/test.android TESTS_ROOT=$COCOS2DX_ROOT/tests/test.android

22
tests/test.android/jni/tests/Android.mk
View File

@ -82,21 +82,23 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../cocos2dx \
$(LOCAL_PATH)/../../../../CocosDenshion/include $(LOCAL_PATH)/../../../../CocosDenshion/include
# it is used for ndk-r4 # it is used for ndk-r4
LOCAL_LDLIBS := -L$(LOCAL_PATH)/../../libs/armeabi \ # if you build with nkd-r4, uncomment it
-lGLESv1_CM \ # LOCAL_LDLIBS := -L$(LOCAL_PATH)/../../libs/armeabi \
-lcocos2d -lcocosdenshion -llog \ # -lGLESv1_CM \
-lbox2d -lchipmunk \ # -lcocos2d -lcocosdenshion -llog \
-L$(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/libraries -lcurl # -lbox2d -lchipmunk \
# -L$(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/libraries -lcurl
# it is used for ndk-r5 # it is used for ndk-r5
# if you build with ndk-r4, comment it
# because the new Windows toolchain doesn't support Cygwin's drive # because the new Windows toolchain doesn't support Cygwin's drive
# mapping (i.e /cygdrive/c/ instead of C:/) # mapping (i.e /cygdrive/c/ instead of C:/)
#LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../../libs/armeabi) \ LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../../libs/armeabi) \
# -lGLESv1_CM \ -lGLESv1_CM \
# -lcocos2d -llog -lcocosdenshion \ -lcocos2d -llog -lcocosdenshion \
# -lbox2d -lchipmunk \ -lbox2d -lchipmunk \
# -L$(call host-path, $(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/libraries) -lcurl -L$(call host-path, $(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/libraries) -lcurl
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)