diff --git a/HelloWorld/android/jni/helloworld/Android.mk b/HelloWorld/android/jni/helloworld/Android.mk index 9f16452022..d5776ed114 100644 --- a/HelloWorld/android/jni/helloworld/Android.mk +++ b/HelloWorld/android/jni/helloworld/Android.mk @@ -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 \ diff --git a/template/android/AndroidTemplate1.mk b/template/android/AndroidTemplate1.mk index ab11a4f9b6..3675d88d34 100644 --- a/template/android/AndroidTemplate1.mk +++ b/template/android/AndroidTemplate1.mk @@ -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) \ No newline at end of file diff --git a/template/android/Application.mk b/template/android/Application.mk index d132003bbd..f240662d57 100644 --- a/template/android/Application.mk +++ b/template/android/Application.mk @@ -1,3 +1,3 @@ # it is needed for ndk-r5 APP_STL := stlport_static -APP_MODULES := cocos2d cocosdenshion game \ No newline at end of file +APP_MODULES := game \ No newline at end of file