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

Merge pull request #16069 from minggo/ndkr12b-issue 

fix compiling and linking error with ndk r12b
This commit is contained in:
minggo 2016-07-08 17:01:09 +08:00 committed by GitHub
parent 8d8c295ff0 a144006931
commit c267167d07
50 changed files with 68 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos/3d/Android.mk
View File

@ -2,6 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := cocos3d_static
LOCAL_ARM_MODE := arm
LOCAL_MODULE_FILENAME := libcocos3d

2
cocos/Android.mk
View File

@ -6,9 +6,7 @@ LOCAL_MODULE := cocos2dx_internal_static
LOCAL_MODULE_FILENAME := libcocos2dxinternal
ifeq ($(USE_ARM_MODE),1)
LOCAL_ARM_MODE := arm
endif
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
MATHNEONFILE := math/MathUtil.cpp.neon

2
cocos/editor-support/cocosbuilder/Android.mk
View File

@ -5,9 +5,7 @@ LOCAL_MODULE := cocosbuilder_static
LOCAL_MODULE_FILENAME := libcocosbuilder
ifeq ($(USE_ARM_MODE),1)
LOCAL_ARM_MODE := arm
endif
LOCAL_SRC_FILES := CCBAnimationManager.cpp \
CCBFileLoader.cpp \

2
cocos/editor-support/cocostudio/Android.mk
View File

@ -5,9 +5,7 @@ LOCAL_MODULE := cocostudio_static
LOCAL_MODULE_FILENAME := libcocostudio
ifeq ($(USE_ARM_MODE),1)
LOCAL_ARM_MODE := arm
endif
LOCAL_SRC_FILES := CCActionFrame.cpp \
CCActionFrameEasing.cpp \

2
cocos/editor-support/spine/Android.mk
View File

@ -5,9 +5,7 @@ LOCAL_MODULE := spine_static
LOCAL_MODULE_FILENAME := libspine
ifeq ($(USE_ARM_MODE),1)
LOCAL_ARM_MODE := arm
endif
LOCAL_SRC_FILES := Animation.c \
AnimationState.c \

2
cocos/network/Android.mk
View File

@ -5,6 +5,8 @@ LOCAL_MODULE := cocos_network_static
LOCAL_MODULE_FILENAME := libnetwork
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := HttpClient-android.cpp \
SocketIO.cpp \
WebSocket.cpp \

4
cocos/scripting/js-bindings/proj.android/Android.mk
View File

@ -6,9 +6,7 @@ LOCAL_MODULE := cocos2d_js_android_static
LOCAL_MODULE_FILENAME := libjscocos2dandroid
ifeq ($(COCOS_SIMULATOR_BUILD),1)
LOCAL_ARM_MODE := arm
endif
LOCAL_SRC_FILES := ../manual/platform/android/CCJavascriptJavaBridge.cpp
@ -35,6 +33,8 @@ LOCAL_MODULE := cocos2d_js_static
LOCAL_MODULE_FILENAME := libjscocos2d
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := ../auto/jsb_cocos2dx_3d_auto.cpp \
../auto/jsb_cocos2dx_extension_auto.cpp \
../auto/jsb_cocos2dx_3d_extension_auto.cpp \

4
cocos/scripting/lua-bindings/proj.android/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := cocos2d_lua_android_static
LOCAL_MODULE_FILENAME := libluacocos2dandroid
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := ../manual/platform/android/CCLuaJavaBridge.cpp \
../manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp
@ -31,9 +33,7 @@ LOCAL_MODULE := cocos2d_lua_static
LOCAL_MODULE_FILENAME := libluacocos2d
ifeq ($(COCOS_SIMULATOR_BUILD),1)
LOCAL_ARM_MODE := arm
endif
LOCAL_SRC_FILES := ../manual/CCLuaBridge.cpp \
../manual/CCLuaEngine.cpp \

2
cocos/storage/local-storage/Android.mk
View File

@ -5,6 +5,8 @@ LOCAL_MODULE := cocos_localstorage_static
LOCAL_MODULE_FILENAME := liblocalstorage
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := LocalStorage.cpp \
LocalStorage-android.cpp

2
cocos/ui/Android.mk
View File

@ -5,9 +5,7 @@ LOCAL_MODULE := cocos_ui_static
LOCAL_MODULE_FILENAME := libui
ifeq ($(USE_ARM_MODE),1)
LOCAL_ARM_MODE := arm
endif
LOCAL_SRC_FILES := \
UIWidget.cpp \

2
extensions/Android.mk
View File

@ -5,9 +5,7 @@ LOCAL_MODULE := cocos_extension_static
LOCAL_MODULE_FILENAME := libextension
ifeq ($(USE_ARM_MODE),1)
LOCAL_ARM_MODE := arm
endif
LOCAL_SRC_FILES := \
assets-manager/AssetsManager.cpp \

2
external/config.json vendored
View File

@ -1,5 +1,5 @@
{
"version":"v3-deps-100",
"version":"v3-deps-101",
"zip_file_size":"128440074",
"repo_name":"cocos2d-x-3rd-party-libs-bin",
"repo_parent":"https://github.com/cocos2d/",

2
tests/cpp-empty-test/proj.android-studio/app/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := cpp_empty_test_shared
LOCAL_MODULE_FILENAME := libcpp_empty_test
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := main.cpp \
../../../Classes/AppDelegate.cpp \
../../../Classes/HelloWorldScene.cpp

2
tests/cpp-empty-test/proj.android-studio/app/jni/Application.mk
View File

@ -2,7 +2,7 @@ APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
APP_LDFLAGS := -latomic
APP_ABI := armeabi
ifeq ($(NDK_DEBUG),1)
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1

2
tests/cpp-empty-test/proj.android/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := cpp_empty_test_shared
LOCAL_MODULE_FILENAME := libcpp_empty_test
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := main.cpp \
../../Classes/AppDelegate.cpp \
../../Classes/HelloWorldScene.cpp

1
tests/cpp-empty-test/proj.android/jni/Application.mk
View File

@ -2,6 +2,7 @@ APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
APP_LDFLAGS := -latomic
APP_ABI := armeabi
ifeq ($(NDK_DEBUG),1)

2
tests/cpp-tests/proj.android-studio/app/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := cpp_tests_shared
LOCAL_MODULE_FILENAME := libcpp_tests
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := main.cpp \
../../../Classes/ActionManagerTest/ActionManagerTest.cpp \
../../../Classes/ActionsEaseTest/ActionsEaseTest.cpp \

2
tests/cpp-tests/proj.android-studio/app/jni/Application.mk
View File

@ -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
ifeq ($(NDK_DEBUG),1)
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1
APP_OPTIM := debug

2
tests/cpp-tests/proj.android/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := cpp_tests_shared
LOCAL_MODULE_FILENAME := libcpp_tests
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := main.cpp \
../../Classes/ActionManagerTest/ActionManagerTest.cpp \
../../Classes/ActionsEaseTest/ActionsEaseTest.cpp \

2
tests/cpp-tests/proj.android/jni/Application.mk
View File

@ -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
ifeq ($(NDK_DEBUG),1)
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1
APP_OPTIM := debug

2
tests/game-controller-test/proj.android-studio/app/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := game_controller_test_shared
LOCAL_MODULE_FILENAME := libgame_controller_test
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := main.cpp \
../../../Classes/AppDelegate.cpp \
../../../Classes/GameControllerTest.cpp

2
tests/game-controller-test/proj.android-studio/app/jni/Application.mk
View File

@ -2,7 +2,7 @@ APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
APP_LDFLAGS := -latomic
APP_ABI := armeabi
ifeq ($(NDK_DEBUG),1)
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1

2
tests/game-controller-test/proj.android/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := game_controller_test_shared
LOCAL_MODULE_FILENAME := libgame_controller_test
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := main.cpp \
../../Classes/AppDelegate.cpp \
../../Classes/GameControllerTest.cpp

2
tests/game-controller-test/proj.android/jni/Application.mk
View File

@ -2,7 +2,7 @@ APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
APP_LDFLAGS := -latomic
APP_ABI := armeabi
ifeq ($(NDK_DEBUG),1)
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1

2
tests/js-memory-gc-tests/project/proj.android-studio/app/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := js_tests_shared
LOCAL_MODULE_FILENAME := libjs_tests
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := main.cpp \
../../../Classes/AppDelegate.cpp \
../../../Classes/js_DrawNode3D_bindings.cpp \

3
tests/js-memory-gc-tests/project/proj.android-studio/app/jni/Application.mk
View File

@ -5,8 +5,7 @@ APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
APP_LDFLAGS := -latomic
USE_ARM_MODE := 1
APP_ABI := armeabi
ifeq ($(NDK_DEBUG),1)
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1

2
tests/js-memory-gc-tests/project/proj.android/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := js_tests_shared
LOCAL_MODULE_FILENAME := libjs_tests
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := main.cpp \
../../Classes/AppDelegate.cpp \
../../Classes/js_DrawNode3D_bindings.cpp \

3
tests/js-memory-gc-tests/project/proj.android/jni/Application.mk
View File

@ -5,8 +5,7 @@ APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
APP_LDFLAGS := -latomic
USE_ARM_MODE := 1
APP_ABI := armeabi
ifeq ($(NDK_DEBUG),1)
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1

2
tests/js-tests/project/proj.android-studio/app/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := js_tests_shared
LOCAL_MODULE_FILENAME := libjs_tests
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := main.cpp \
../../../Classes/AppDelegate.cpp \
../../../Classes/js_DrawNode3D_bindings.cpp \

3
tests/js-tests/project/proj.android-studio/app/jni/Application.mk
View File

@ -5,8 +5,7 @@ APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
APP_LDFLAGS := -latomic
USE_ARM_MODE := 1
APP_ABI := armeabi
ifeq ($(NDK_DEBUG),1)
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1

2
tests/js-tests/project/proj.android/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := js_tests_shared
LOCAL_MODULE_FILENAME := libjs_tests
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := main.cpp \
../../Classes/AppDelegate.cpp \
../../Classes/js_DrawNode3D_bindings.cpp \

3
tests/js-tests/project/proj.android/jni/Application.mk
View File

@ -5,8 +5,7 @@ APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
APP_LDFLAGS := -latomic
USE_ARM_MODE := 1
APP_ABI := armeabi
ifeq ($(NDK_DEBUG),1)
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1

2
tests/lua-empty-test/project/proj.android-studio/app/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := lua_empty_test_shared
LOCAL_MODULE_FILENAME := liblua_empty_test
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := main.cpp \
../../../Classes/AppDelegate.cpp

1
tests/lua-empty-test/project/proj.android-studio/app/jni/Application.mk
View File

@ -2,6 +2,7 @@ APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
APP_LDFLAGS := -latomic
APP_ABI := armeabi
ifeq ($(NDK_DEBUG),1)

2
tests/lua-empty-test/project/proj.android/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := lua_empty_test_shared
LOCAL_MODULE_FILENAME := liblua_empty_test
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := main.cpp \
../../Classes/AppDelegate.cpp

1
tests/lua-empty-test/project/proj.android/jni/Application.mk
View File

@ -2,6 +2,7 @@ APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
APP_LDFLAGS := -latomic
APP_ABI := armeabi
ifeq ($(NDK_DEBUG),1)

2
tests/lua-game-controller-test/project/proj.android-studio/app/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := lua_game_controller_test_shared
LOCAL_MODULE_FILENAME := liblua_game_controller
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := main.cpp \
../../../Classes/AppDelegate.cpp \
../../../../../../cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp \

1
tests/lua-game-controller-test/project/proj.android-studio/app/jni/Application.mk
View File

@ -2,6 +2,7 @@ APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
APP_LDFLAGS := -latomic
APP_ABI := armeabi
ifeq ($(NDK_DEBUG),1)

2
tests/lua-game-controller-test/project/proj.android/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := lua_game_controller_test_shared
LOCAL_MODULE_FILENAME := liblua_game_controller
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := main.cpp \
../../Classes/AppDelegate.cpp \
../../../../../cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp \

2
tests/lua-game-controller-test/project/proj.android/jni/Application.mk
View File

@ -2,7 +2,7 @@ APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
APP_LDFLAGS := -latomic
APP_ABI := armeabi
ifeq ($(NDK_DEBUG),1)
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1

2
tests/lua-tests/project/proj.android-studio/app/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := lua_tests_shared
LOCAL_MODULE_FILENAME := liblua_tests
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES += main.cpp \
../../../Classes/AppDelegate.cpp \
../../../Classes/lua_assetsmanager_test_sample.cpp \

2
tests/lua-tests/project/proj.android-studio/app/jni/Application.mk
View File

@ -2,7 +2,7 @@ APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
APP_LDFLAGS := -latomic
APP_ABI := armeabi
ifeq ($(NDK_DEBUG),1)
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1

2
tests/lua-tests/project/proj.android/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := lua_tests_shared
LOCAL_MODULE_FILENAME := liblua_tests
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES += main.cpp \
../../Classes/AppDelegate.cpp \
../../Classes/lua_assetsmanager_test_sample.cpp \

2
tests/lua-tests/project/proj.android/jni/Application.mk
View File

@ -2,7 +2,7 @@ APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
APP_LDFLAGS := -latomic
APP_ABI := armeabi
ifeq ($(NDK_DEBUG),1)
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1

2
tests/performance-tests/proj.android-studio/app/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := cocos2dcpp_shared
LOCAL_MODULE_FILENAME := libcocos2dcpp
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := hellocpp/main.cpp \
../../../Classes/AppDelegate.cpp \
../../../Classes/Profile.cpp \

2
tests/performance-tests/proj.android-studio/app/jni/Application.mk
View File

@ -2,7 +2,7 @@ APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
APP_LDFLAGS := -latomic
APP_ABI := armeabi
ifeq ($(NDK_DEBUG),1)
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1

2
tests/performance-tests/proj.android/jni/Android.mk
View File

@ -6,6 +6,8 @@ LOCAL_MODULE := cocos2dcpp_shared
LOCAL_MODULE_FILENAME := libcocos2dcpp
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := hellocpp/main.cpp \
../../Classes/AppDelegate.cpp \
../../Classes/Profile.cpp \

2
tests/performance-tests/proj.android/jni/Application.mk
View File

@ -2,7 +2,7 @@ APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char
APP_LDFLAGS := -latomic
APP_ABI := armeabi
ifeq ($(NDK_DEBUG),1)
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1

2
tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk
View File

@ -6,9 +6,7 @@ LOCAL_MODULE := cocos2dlua_shared
LOCAL_MODULE_FILENAME := libcocos2dlua
ifeq ($(COCOS_SIMULATOR_BUILD),1)
LOCAL_ARM_MODE := arm
endif
FILE_LIST := hellolua/main.cpp
FILE_LIST += $(wildcard $(LOCAL_PATH)/../../Classes/*.cpp)

2
tools/simulator/libsimulator/proj.android/Android.mk
View File

@ -5,6 +5,8 @@ LOCAL_MODULE := cocos2d_simulator_static
LOCAL_MODULE_FILENAME := libsimulator
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := \
../lib/protobuf-lite/google/protobuf/io/coded_stream.cc \
../lib/protobuf-lite/google/protobuf/stubs/common.cc \