Merge pull request #116 from xianyinchen/v2.4
disable cocos2djni library for x86_64.
This commit is contained in:
commit
aab594da1a
|
|
@ -127,11 +127,13 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/$(TARGET_ARCH_ABI)/include/freetype
|
||||||
include $(PREBUILT_STATIC_LIBRARY)
|
include $(PREBUILT_STATIC_LIBRARY)
|
||||||
|
|
||||||
#======================================
|
#======================================
|
||||||
|
ifneq ($(TARGET_ARCH),x86_64)
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
LOCAL_MODULE := cocos2djni
|
LOCAL_MODULE := cocos2djni
|
||||||
LOCAL_MODULE_FILENAME := libcocos2djni
|
LOCAL_MODULE_FILENAME := libcocos2djni
|
||||||
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libcocos2djni.a
|
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libcocos2djni.a
|
||||||
include $(PREBUILT_STATIC_LIBRARY)
|
include $(PREBUILT_STATIC_LIBRARY)
|
||||||
|
endif
|
||||||
#======================================
|
#======================================
|
||||||
#$(call import-module,android/cpufeatures)
|
#$(call import-module,android/cpufeatures)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue