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

rename libs to libraries and modify cocos2dx/Android.mk

This commit is contained in:
minggo 2011-03-07 10:00:33 +08:00
parent aaf898cb72
commit d3f93b658d
6 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos2dx/Android.mk
View File

@ -120,7 +120,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \
$(LOCAL_PATH)/../platform_support/third_party/android/skia/xml $(LOCAL_PATH)/../platform_support/third_party/android/skia/xml
#it is used for ndk-r4 #it is used for ndk-r4
LOCAL_LDLIBS := -L$(LOCAL_PATH)/../platform_support/third_party/android/libs \ LOCAL_LDLIBS := -L$(LOCAL_PATH)/../platform_support/third_party/android/libraries \
-lGLESv1_CM -llog -lz \ -lGLESv1_CM -llog -lz \
-lpng \ -lpng \
-lxml2 \ -lxml2 \
@ -130,7 +130,7 @@ LOCAL_LDLIBS := -L$(LOCAL_PATH)/../platform_support/third_party/android/libs \
# it is used for ndk-r5 # it is used for ndk-r5
# 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_support/third_party/android/libs) \ #LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../platform_support/third_party/android/libraries) \
# -lGLESv1_CM -llog -lz \ # -lGLESv1_CM -llog -lz \
# -lpng \ # -lpng \
# -lxml2 \ # -lxml2 \

1
platform_support/third_party/android/libraries/libjpeg.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
b595fbd4d9aca89e30aab2b4216457f20ec58b9d

1
platform_support/third_party/android/libraries/libpng.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
362db1d6889070f3a653f3d15e245451a6214625

1
platform_support/third_party/android/libraries/libsgl.so.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
63b142a79d20576743534c38d9a35a4efd132b28

1
platform_support/third_party/android/libraries/libskia.so.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
471a64ce0151f2d7c3f384323f8c43a903da39bf

1
platform_support/third_party/android/libraries/libxml2.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
c52d9a4845ee08c89ce4079d7d3feb2ae96e7178