diff --git a/cocos/platform/android/CCEnhanceAPI-android.cpp b/cocos/platform/android/CCEnhanceAPI-android.cpp index 5e7c28cb6d..a748393c9b 100644 --- a/cocos/platform/android/CCEnhanceAPI-android.cpp +++ b/cocos/platform/android/CCEnhanceAPI-android.cpp @@ -29,11 +29,12 @@ // FIXME: using ndk-r10c will cause the next function could not be found. It may be a bug of ndk-r10c. // Here is the workaround method to fix the problem. -#ifdef __aarch64__ -extern "C" size_t __ctype_get_mb_cur_max(void) { - return (size_t) sizeof(wchar_t); -} -#endif +// Fixed, at least, in NDK 12b +//#ifdef __aarch64__ +//extern "C" size_t __ctype_get_mb_cur_max(void) { +// return (size_t) sizeof(wchar_t); +//} +//#endif NS_CC_BEGIN diff --git a/cocos/scripting/lua-bindings/proj.android/Android.mk b/cocos/scripting/lua-bindings/proj.android/Android.mk index 4a3f1390cd..4606be718a 100644 --- a/cocos/scripting/lua-bindings/proj.android/Android.mk +++ b/cocos/scripting/lua-bindings/proj.android/Android.mk @@ -21,7 +21,17 @@ LOCAL_EXPORT_LDLIBS := -lGLESv2 \ -llog \ -landroid -LOCAL_STATIC_LIBRARIES := luajit_static +ifeq ($(TARGET_ARCH_ABI),arm64-v8a) +LUA_STATIC_LIB := lua_static +LUA_IMPORT_PATH := lua/lua +LUA_INCLUDE_PATH := $(LOCAL_PATH)/../../../../external/lua/lua +else +LUA_STATIC_LIB := luajit_static +LUA_IMPORT_PATH := lua/luajit/prebuilt/android +LUA_INCLUDE_PATH := $(LOCAL_PATH)/../../../../external/lua/luajit/include +endif + +LOCAL_STATIC_LIBRARIES := $(LUA_STATIC_LIB) include $(BUILD_STATIC_LIBRARY) @@ -134,7 +144,7 @@ LOCAL_SRC_FILES += ../manual/navmesh/lua_cocos2dx_navmesh_conversions.cpp \ ../auto/lua_cocos2dx_navmesh_auto.cpp \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \ - $(LOCAL_PATH)/../../../../external/lua/luajit/include \ + $(LUA_INCLUDE_PATH) \ $(LOCAL_PATH)/../../../2d \ $(LOCAL_PATH)/../../../3d \ $(LOCAL_PATH)/../../../network \ @@ -164,7 +174,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \ $(LOCAL_PATH)/../../../../external/lua LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \ - $(LOCAL_PATH)/../../../../external/lua/luajit/include \ + $(LUA_INCLUDE_PATH) \ $(LOCAL_PATH)/../auto \ $(LOCAL_PATH)/../manual \ $(LOCAL_PATH)/../manual/cocos2d \ @@ -186,5 +196,5 @@ LOCAL_STATIC_LIBRARIES := cocos2dx_static include $(BUILD_STATIC_LIBRARY) -$(call import-module,lua/luajit/prebuilt/android) +$(call import-module,$(LUA_IMPORT_PATH)) $(call import-module,.) diff --git a/external/config.json b/external/config.json index 65ac538da3..ce3265eaf9 100644 --- a/external/config.json +++ b/external/config.json @@ -1,5 +1,5 @@ { - "version":"v3-deps-101", + "version":"v3-deps-103", "zip_file_size":"128440074", "repo_name":"cocos2d-x-3rd-party-libs-bin", "repo_parent":"https://github.com/cocos2d/", diff --git a/tests/cpp-empty-test/proj.android/jni/Application.mk b/tests/cpp-empty-test/proj.android/jni/Application.mk index 231945156f..08a30a7e08 100644 --- a/tests/cpp-empty-test/proj.android/jni/Application.mk +++ b/tests/cpp-empty-test/proj.android/jni/Application.mk @@ -2,6 +2,8 @@ APP_STL := gnustl_static APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic + +#APP_ABI := arm64-v8a APP_ABI := armeabi diff --git a/tests/cpp-tests/proj.android/jni/Application.mk b/tests/cpp-tests/proj.android/jni/Application.mk index a6bf3f4c29..f87ad0be2a 100644 --- a/tests/cpp-tests/proj.android/jni/Application.mk +++ b/tests/cpp-tests/proj.android/jni/Application.mk @@ -3,8 +3,10 @@ APP_STL := gnustl_static APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic +#APP_ABI := arm64-v8a APP_ABI := armeabi + ifeq ($(NDK_DEBUG),1) APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 APP_OPTIM := debug diff --git a/tests/game-controller-test/proj.android/jni/Application.mk b/tests/game-controller-test/proj.android/jni/Application.mk index 760bf75982..2bcce03193 100644 --- a/tests/game-controller-test/proj.android/jni/Application.mk +++ b/tests/game-controller-test/proj.android/jni/Application.mk @@ -3,6 +3,7 @@ APP_STL := gnustl_static APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic APP_ABI := armeabi +#APP_ABI := arm64-v8a ifeq ($(NDK_DEBUG),1) APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 diff --git a/tests/js-tests/project/proj.android/jni/Application.mk b/tests/js-tests/project/proj.android/jni/Application.mk index a49b14ad8e..4ccf408c6a 100644 --- a/tests/js-tests/project/proj.android/jni/Application.mk +++ b/tests/js-tests/project/proj.android/jni/Application.mk @@ -6,6 +6,8 @@ APP_STL := gnustl_static APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic APP_ABI := armeabi +#APP_ABI := arm64-v8a + ifeq ($(NDK_DEBUG),1) APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 diff --git a/tests/lua-empty-test/project/proj.android/jni/Application.mk b/tests/lua-empty-test/project/proj.android/jni/Application.mk index 231945156f..a78d3fd4ab 100644 --- a/tests/lua-empty-test/project/proj.android/jni/Application.mk +++ b/tests/lua-empty-test/project/proj.android/jni/Application.mk @@ -3,6 +3,7 @@ APP_STL := gnustl_static APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic APP_ABI := armeabi +#APP_ABI := arm64-v8a ifeq ($(NDK_DEBUG),1) diff --git a/tests/lua-tests/project/proj.android/jni/Application.mk b/tests/lua-tests/project/proj.android/jni/Application.mk index 760bf75982..a78d3fd4ab 100644 --- a/tests/lua-tests/project/proj.android/jni/Application.mk +++ b/tests/lua-tests/project/proj.android/jni/Application.mk @@ -3,6 +3,8 @@ APP_STL := gnustl_static APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic APP_ABI := armeabi +#APP_ABI := arm64-v8a + ifeq ($(NDK_DEBUG),1) APP_CPPFLAGS += -DCOCOS2D_DEBUG=1