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

Merge branch 'v3' into mergeExtensionEditBox 

Conflicts:
	cocos/ui/Android.mk
This commit is contained in:
andyque 2014-08-20 09:32:29 +08:00
parent a8ab1a85b7 18cc62d16d
commit 07eb0d373c
17 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/Android.mk
View File

@ -210,10 +210,10 @@ LOCAL_EXPORT_LDLIBS := -lGLESv2 \
-lz \
-landroid
LOCAL_WHOLE_STATIC_LIBRARIES := cocos_freetype2_static
LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_png_static
LOCAL_STATIC_LIBRARIES := cocos_freetype2_static
LOCAL_STATIC_LIBRARIES += chipmunk_static
LOCAL_STATIC_LIBRARIES += cocos_png_static
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dxandroid_static
# define the macro to compile through support/zip_support/ioapi.c
LOCAL_CFLAGS := -DUSE_FILE32API

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

@ -36,7 +36,7 @@ $(LOCAL_PATH) \
$(LOCAL_PATH)/../../..
LOCAL_WHOLE_STATIC_LIBRARIES := cocos_extension_static
LOCAL_STATIC_LIBRARIES := cocos_extension_static
include $(BUILD_STATIC_LIBRARY)

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

@ -71,8 +71,8 @@ $(LOCAL_PATH)/../..
LOCAL_CFLAGS += -fexceptions
LOCAL_WHOLE_STATIC_LIBRARIES := cocos_ui_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
LOCAL_STATIC_LIBRARIES := cocos_ui_static
LOCAL_STATIC_LIBRARIES += cocosdenshion_static
include $(BUILD_STATIC_LIBRARY)

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

@ -36,7 +36,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/..
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../.. \
$(LOCAL_PATH)/..
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
LOCAL_STATIC_LIBRARIES := cocos2dx_static
include $(BUILD_STATIC_LIBRARY)

6
cocos/network/Android.mk
View File

@ -16,9 +16,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../.. \
$(LOCAL_PATH)/..
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_curl_static
LOCAL_WHOLE_STATIC_LIBRARIES += libwebsockets_static
LOCAL_STATIC_LIBRARIES := cocos2dx_static
LOCAL_STATIC_LIBRARIES += cocos_curl_static
LOCAL_STATIC_LIBRARIES += libwebsockets_static
include $(BUILD_STATIC_LIBRARY)

2
cocos/platform/winrt/CCFileUtilsWinRT.cpp
View File

@ -53,7 +53,7 @@ static void _checkPath()
if (s_pszResourcePath.empty())
{
// TODO: needs to be tested
s_pszResourcePath = convertPathFormatToUnixStyle(CCFileUtilsWinRT::getAppPath() + '\\' + "Assets\\Resources" + '\\');
s_pszResourcePath = convertPathFormatToUnixStyle(CCFileUtilsWinRT::getAppPath() + '\\' + "Assets\\res" + '\\');
}
}

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

@ -55,8 +55,8 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../manual/cocos2d
LOCAL_WHOLE_STATIC_LIBRARIES := luajit_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dx_static
LOCAL_STATIC_LIBRARIES := luajit_static
LOCAL_STATIC_LIBRARIES += cocos2dx_static
include $(BUILD_STATIC_LIBRARY)
@ -76,8 +76,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../auto \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/3d
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos3d_static
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocos3d_static
include $(BUILD_STATIC_LIBRARY)
@ -97,8 +97,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../auto \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/cocosdenshion
LOCAL_WHOLE_STATIC_LIBRARIES := cocosdenshion_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos2d_lua_static
LOCAL_STATIC_LIBRARIES := cocosdenshion_static
LOCAL_STATIC_LIBRARIES += cocos2d_lua_static
include $(BUILD_STATIC_LIBRARY)
@ -134,8 +134,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/network \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/network
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocos_network_static
include $(BUILD_STATIC_LIBRARY)
@ -156,8 +156,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/cocosbuilder \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/cocosbuilder
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocosbuilder_static
include $(BUILD_STATIC_LIBRARY)
@ -179,8 +179,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/cocostudio \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/cocostudio
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocostudio_static
include $(BUILD_STATIC_LIBRARY)
@ -201,8 +201,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/spine \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/spine
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += spine_static
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += spine_static
include $(BUILD_STATIC_LIBRARY)
@ -223,8 +223,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/extension \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/extension
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocos_extension_static
include $(BUILD_STATIC_LIBRARY)
@ -246,8 +246,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/ui \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/ui
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_ui_static
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocos_ui_static
include $(BUILD_STATIC_LIBRARY)

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

@ -17,7 +17,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../..
LOCAL_CFLAGS += -Wno-psabi
LOCAL_EXPORT_CFLAGS += -Wno-psabi
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
LOCAL_STATIC_LIBRARIES := cocos2dx_static
include $(BUILD_STATIC_LIBRARY)

2
cocos/ui/Android.mk
View File

@ -44,7 +44,7 @@ $(LOCAL_PATH)/../.. \
$(LOCAL_PATH)/../editor-support
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
LOCAL_STATIC_LIBRARIES := cocos2dx_static
include $(BUILD_STATIC_LIBRARY)

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

@ -12,7 +12,7 @@ LOCAL_SRC_FILES := main.cpp \
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static cocosdenshion_static
LOCAL_STATIC_LIBRARIES := cocos2dx_static cocosdenshion_static
include $(BUILD_SHARED_LIBRARY)

16
tests/cpp-tests/Android.mk
View File

@ -189,14 +189,14 @@ Classes/ZwoptexTest/ZwoptexTest.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/Classes
LOCAL_WHOLE_STATIC_LIBRARIES := cocosbuilder_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
LOCAL_WHOLE_STATIC_LIBRARIES += spine_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos3d_static
LOCAL_STATIC_LIBRARIES := cocosbuilder_static
LOCAL_STATIC_LIBRARIES += cocosdenshion_static
LOCAL_STATIC_LIBRARIES += spine_static
LOCAL_STATIC_LIBRARIES += cocostudio_static
LOCAL_STATIC_LIBRARIES += cocos_network_static
LOCAL_STATIC_LIBRARIES += cocos_extension_static
LOCAL_STATIC_LIBRARIES += box2d_static
LOCAL_STATIC_LIBRARIES += cocos3d_static
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/Classes

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

@ -10,7 +10,7 @@ LOCAL_SRC_FILES := main.cpp
LOCAL_C_INCLUDES := ../../Classes
LOCAL_WHOLE_STATIC_LIBRARIES := cocos_cpp_tests_common
LOCAL_STATIC_LIBRARIES := cocos_cpp_tests_common
include $(BUILD_SHARED_LIBRARY)

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

@ -13,7 +13,7 @@ LOCAL_SRC_FILES := main.cpp \
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \
$(LOCAL_PATH)/../../../../external
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static cocosdenshion_static
LOCAL_STATIC_LIBRARIES := cocos2dx_static cocosdenshion_static
include $(BUILD_SHARED_LIBRARY)

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

@ -12,9 +12,9 @@ LOCAL_SRC_FILES := main.cpp \
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \
$(LOCAL_PATH)/../../../../../external/lua/tolua \
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += network_lua_static
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocosdenshion_lua_static
LOCAL_STATIC_LIBRARIES += network_lua_static
include $(BUILD_SHARED_LIBRARY)

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

@ -17,8 +17,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \
$(LOCAL_PATH)/../../../../../cocos/scripting/lua-bindings/manual\controller \
$(LOCAL_PATH)/../../../../../cocos/base
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocosdenshion_static
include $(BUILD_SHARED_LIBRARY)

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

@ -13,15 +13,15 @@ LOCAL_SRC_FILES += main.cpp \
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../Classes
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += network_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += spine_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += extension_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += ui_lua_static
LOCAL_WHOLE_STATIC_LIBRARIES += cocos3d_lua_static
LOCAL_STATIC_LIBRARIES := cocos2d_lua_static
LOCAL_STATIC_LIBRARIES += cocosdenshion_lua_static
LOCAL_STATIC_LIBRARIES += network_lua_static
LOCAL_STATIC_LIBRARIES += cocosbuilder_lua_static
LOCAL_STATIC_LIBRARIES += cocostudio_lua_static
LOCAL_STATIC_LIBRARIES += spine_lua_static
LOCAL_STATIC_LIBRARIES += extension_lua_static
LOCAL_STATIC_LIBRARIES += ui_lua_static
LOCAL_STATIC_LIBRARIES += cocos3d_lua_static
include $(BUILD_SHARED_LIBRARY)

2
tools/cocos2d-console

@ -1 +1 @@
Subproject commit b2a0338f0a6d51878ce96c4e0521d083e232e67b
Subproject commit 196bb42c4fb72442230685fda0f100540052d60d