mirror of https://github.com/axmolengine/axmol.git
fix xcode compiling error and simplify android.mk
This commit is contained in:
parent
63c13d8eaa
commit
5f65cdc3c0
|
@ -1 +1 @@
|
||||||
9fac2ba89faf5e6f3c870c02f5186641e6be1590
|
a791b9789e080d3e7530890cfbaa966fffef5f9e
|
|
@ -191,12 +191,7 @@ LOCAL_EXPORT_LDLIBS := -lGLESv2 \
|
||||||
-lz \
|
-lz \
|
||||||
-landroid
|
-landroid
|
||||||
|
|
||||||
LOCAL_WHOLE_STATIC_LIBRARIES := cocos_libpng_static
|
LOCAL_WHOLE_STATIC_LIBRARIES := cocos_freetype2_static
|
||||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_jpeg_static
|
|
||||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_libxml2_static
|
|
||||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_libtiff_static
|
|
||||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_libwebp_static
|
|
||||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_freetype2_static
|
|
||||||
LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
|
LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
|
||||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
|
LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@ LOCAL_EXPORT_LDLIBS := -lGLESv1_CM \
|
||||||
-lz \
|
-lz \
|
||||||
-landroid
|
-landroid
|
||||||
|
|
||||||
LOCAL_WHOLE_STATIC_LIBRARIES := android_native_app_glue cocos_libpng_static cocos_jpeg_static cocos_libxml2_static cocos_libtiff_static cocos_libwebp_static
|
LOCAL_WHOLE_STATIC_LIBRARIES := android_native_app_glue cocos_png_static cocos_jpeg_static cocos_tiff_static cocos_webp_static
|
||||||
|
|
||||||
|
|
||||||
include $(BUILD_STATIC_LIBRARY)
|
include $(BUILD_STATIC_LIBRARY)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
LOCAL_PATH := $(call my-dir)
|
LOCAL_PATH := $(call my-dir)
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
LOCAL_MODULE := cocos_libpng_static
|
LOCAL_MODULE := cocos_png_static
|
||||||
LOCAL_MODULE_FILENAME := png
|
LOCAL_MODULE_FILENAME := png
|
||||||
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libpng.a
|
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libpng.a
|
||||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
|
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
LOCAL_PATH := $(call my-dir)
|
LOCAL_PATH := $(call my-dir)
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
LOCAL_MODULE := cocos_libtiff_static
|
LOCAL_MODULE := cocos_tiff_static
|
||||||
LOCAL_MODULE_FILENAME := tiff
|
LOCAL_MODULE_FILENAME := tiff
|
||||||
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libtiff.a
|
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libtiff.a
|
||||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
|
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
LOCAL_PATH := $(call my-dir)
|
LOCAL_PATH := $(call my-dir)
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
LOCAL_MODULE := cocos_libwebp_static
|
LOCAL_MODULE := cocos_webp_static
|
||||||
LOCAL_MODULE_FILENAME := webp
|
LOCAL_MODULE_FILENAME := webp
|
||||||
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libwebp.a
|
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libwebp.a
|
||||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
|
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
|
||||||
|
|
Loading…
Reference in New Issue