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

Merge remote branch 'origin/master'

This commit is contained in:
Walzer 2011-06-24 21:04:00 +08:00
parent e606027b59 8f4b20391e
commit fa671c4c0d
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../cocos2dx \
# it is used for ndk-r4
# if you build with nkd-r4, uncomment it
# LOCAL_LDLIBS := -llog -lGLESv1_CM -llog -lz \
# LOCAL_LDLIBS := -llog -lGLESv1_CM -lz \
# -L$(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/libraries -lcurl \
# -lpng \
# -lxml2 \
@ -25,7 +25,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../cocos2dx \
# if you build with ndk-r4, comment it
# because the new Windows toolchain doesn't support Cygwin's drive
# mapping (i.e /cygdrive/c/ instead of C:/)
LOCAL_LDLIBS := -llog -lGLESv1_CM -llog -lz \
LOCAL_LDLIBS := -llog -lGLESv1_CM -lz \
-L$(call host-path, $(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/libraries) -lcurl \
-lpng \
-lxml2 \

17
template/android/AndroidTemplate1.mk
View File

@ -14,15 +14,22 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../cocos2dx \
# 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
# LOCAL_LDLIBS := -llog -lGLESv1_CM -lz \
# -L$(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/libraries -lcurl \
# -lpng \
# -lxml2 \
# -ljpeg
# 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
# mapping (i.e /cygdrive/c/ instead of C:/)
LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../../libs/armeabi) \
-lcocos2d -llog -lcocosdenshion \
-L$(call host-path, $(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/libraries) -lcurl
LOCAL_LDLIBS := -llog -lGLESv1_CM -lz \
-L$(call host-path, $(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/libraries) -lcurl \
-lpng \
-lxml2 \
-ljpeg
LOCAL_STATIC_LIBRARIES := libcocos2d libcocosdenshion
include $(BUILD_SHARED_LIBRARY)

2
template/android/Application.mk
View File

@ -1,3 +1,3 @@
# it is needed for ndk-r5
APP_STL := stlport_static
APP_MODULES := cocos2d cocosdenshion game
APP_MODULES := game