mirror of https://github.com/axmolengine/axmol.git
rename libs to libraries and modify cocos2dx/Android.mk
This commit is contained in:
parent
aaf898cb72
commit
d3f93b658d
|
@ -120,7 +120,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \
|
|||
$(LOCAL_PATH)/../platform_support/third_party/android/skia/xml
|
||||
|
||||
#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 \
|
||||
-lpng \
|
||||
-lxml2 \
|
||||
|
@ -130,7 +130,7 @@ LOCAL_LDLIBS := -L$(LOCAL_PATH)/../platform_support/third_party/android/libs \
|
|||
# it is used for ndk-r5
|
||||
# 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)/../platform_support/third_party/android/libs) \
|
||||
#LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../platform_support/third_party/android/libraries) \
|
||||
# -lGLESv1_CM -llog -lz \
|
||||
# -lpng \
|
||||
# -lxml2 \
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
b595fbd4d9aca89e30aab2b4216457f20ec58b9d
|
|
@ -0,0 +1 @@
|
|||
362db1d6889070f3a653f3d15e245451a6214625
|
|
@ -0,0 +1 @@
|
|||
63b142a79d20576743534c38d9a35a4efd132b28
|
|
@ -0,0 +1 @@
|
|||
471a64ce0151f2d7c3f384323f8c43a903da39bf
|
|
@ -0,0 +1 @@
|
|||
c52d9a4845ee08c89ce4079d7d3feb2ae96e7178
|
Loading…
Reference in New Issue