Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop

build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-7658fe75258895d82e9432317ff63b182547bcdc
+9fac2ba89faf5e6f3c870c02f5186641e6be1590

build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-f0ce606901bf2ba3acceae9e9562214dde6a4c69
+83265c81797ca614f19372a96adf326aeb21b396

cocos/2d/Android.mk

@@ -201,8 +201,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
 
 # define the macro to compile through support/zip_support/ioapi.c
-LOCAL_CFLAGS   := -Wno-psabi -DUSE_FILE32API
+LOCAL_CFLAGS   := -Wno-psabi  -DUSE_FILE32API
+LOCAL_CPPFLAGS := -Wno-literal-suffix
 LOCAL_EXPORT_CFLAGS   := -Wno-psabi -DUSE_FILE32API
+LOCAL_EXPORT_CPPFLAGS := -Wno-literal-suffix
 
 include $(BUILD_STATIC_LIBRARY)
 

cocos/editor-support/cocosbuilder/Android.mk

@@ -29,7 +29,7 @@ CCScale9SpriteLoader.cpp \
 CCScrollViewLoader.cpp \
 CCSpriteLoader.cpp
 
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/ \
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \
 $(LOCAL_PATH)/../../..
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../2d \

cocos/editor-support/cocostudio/Android.mk

@@ -56,9 +56,11 @@ LOCAL_EXPORT_CFLAGS += -Wno-psabi
 
 LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos_gui_static
 
 include $(BUILD_STATIC_LIBRARY)
 
 $(call import-module,2d)
 $(call import-module,audio/android)
+$(call import-module,gui)
 

cocos/gui/Android.mk

@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := gui_static
+LOCAL_MODULE := cocos_gui_static
 
 LOCAL_MODULE_FILENAME := libgui
 

cocos/network/Android.mk

@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := network_static
+LOCAL_MODULE := cocos_network_static
 
 LOCAL_MODULE_FILENAME := libnetwork
 

cocos/scripting/javascript/bindings/Android.mk

@@ -2,9 +2,9 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := scriptingcore-spidermonkey
+LOCAL_MODULE := cocos_jsb_static
 
-LOCAL_MODULE_FILENAME := libscriptingcore-spidermonkey
+LOCAL_MODULE_FILENAME := libcocos2dxjsb
 
 LOCAL_SRC_FILES := ScriptingCore.cpp \
                    cocos2d_specifics.cpp \
@@ -34,18 +34,38 @@ LOCAL_EXPORT_CFLAGS := -DCOCOS2D_JAVASCRIPT
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
                     $(LOCAL_PATH)/../../../CocosDenshion/include \
-                    $(LOCAL_PATH)/../../auto-generated/js-bindings
+                    $(LOCAL_PATH)/../../auto-generated/js-bindings \
+                    $(LOCAL_PATH)/../../../../extensions \
+                    $(LOCAL_PATH)/../../../editor-support/cocostudio
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
                            $(LOCAL_PATH)/../../auto-generated/js-bindings 
 
-LOCAL_WHOLE_STATIC_LIBRARIES := spidermonkey_static
+LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
+LOCAL_WHOLE_STATIC_LIBRARIES += spidermonkey_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static
+LOCAL_WHOLE_STATIC_LIBRARIES += spine_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static
+LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos_localstorage_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
+LOCAL_WHOLE_STATIC_LIBRARIES += websockets_static
 
 LOCAL_LDLIBS := -landroid
 LOCAL_LDLIBS += -llog
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,scripting/javascript/spidermonkey-android)
+$(call import-module,spidermonkey/prebuilt/android)
 $(call import-module,extensions)
+$(call import-module,2d)
+$(call import-module,extensions)
+$(call import-module,editor-support/cocosbuilder)
+$(call import-module,editor-support/spine)
+$(call import-module,network)
+$(call import-module,chipmunk)
+$(call import-module,storage/local-storage)
+$(call import-module,editor-support/cocostudio)
+$(call import-module,websockets/prebuilt/android)

cocos/scripting/javascript/bindings/ScriptingCore.cpp

@@ -16,7 +16,7 @@
 #include "ScriptingCore.h"
 #include "jsdbgapi.h"
 #include "cocos2d.h"
-#include "LocalStorage.h"
+#include "local-storage/LocalStorage.h"
 #include "cocos2d_specifics.hpp"
 #include "js_bindings_config.h"
 // for debug socket

cocos/scripting/javascript/bindings/XMLHTTPRequest.cpp

@@ -67,7 +67,7 @@ void MinXmlHttpRequest::_gotHeader(string header)
     {
         // Seems like we have the response Code! Parse it and check for it.
         char * pch;
-        std::strcpy(cstr, header.c_str());
+        strcpy(cstr, header.c_str());
         
         pch = strtok(cstr," ");
         while (pch != NULL)

cocos/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id

@@ -1 +1 @@
-2641da58037c13f92ae771830a1fdf943e4964d2
+bf994ad1fc8ac1044957d83708f7848e99ca59e6

cocos/scripting/javascript/bindings/js_bindings_chipmunk_manual.cpp

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "cocos-ext.h"
+#include "extensions/cocos-ext.h"
 #include "js_bindings_config.h"
 #ifdef JSB_INCLUDE_CHIPMUNK
 

cocos/scripting/javascript/bindings/js_bindings_system_functions.cpp

@@ -7,7 +7,7 @@
 #include "js_bindings_config.h"
 //#ifdef JSB_INCLUDE_SYSTEM
 
-#include "LocalStorage.h"
+#include "local-storage/LocalStorage.h"
 
 #include "jsfriendapi.h"
 #include "js_bindings_config.h"

cocos/scripting/javascript/bindings/js_bindings_system_registration.cpp

@@ -24,7 +24,7 @@
 
 #include "js_bindings_config.h"
 #include "js_bindings_core.h"
-#include "LocalStorage.h"
+#include "local-storage/LocalStorage.h"
 #include "cocos2d.h"
 
 // system

cocos/scripting/javascript/bindings/jsb_cocos2dx_extension_manual.cpp

@@ -6,7 +6,7 @@
 //
 
 #include "jsb_cocos2dx_extension_manual.h"
-#include "cocos-ext.h"
+#include "extensions/cocos-ext.h"
 #include "ScriptingCore.h"
 #include "cocos2d_specifics.hpp"
 #include "cocostudio/CocoStudio.h"

cocos/scripting/javascript/bindings/jsb_websocket.cpp

@@ -25,7 +25,7 @@ THE SOFTWARE.
 
 #include "jsb_websocket.h"
 #include "cocos2d.h"
-#include "WebSocket.h"
+#include "network/WebSocket.h"
 #include "spidermonkey_specifics.h"
 #include "ScriptingCore.h"
 #include "cocos2d_specifics.hpp"

cocos/scripting/lua/bindings/Android.mk

@@ -5,61 +5,59 @@ LOCAL_MODULE    := cocos_lua_static
 
 LOCAL_MODULE_FILENAME := liblua
 
-LOCAL_SRC_FILES := ../cocos2dx_support/CCLuaBridge.cpp \
-          ../cocos2dx_support/CCLuaEngine.cpp \
-          ../cocos2dx_support/CCLuaStack.cpp \
-          ../cocos2dx_support/CCLuaValue.cpp \
-          ../cocos2dx_support/Cocos2dxLuaLoader.cpp \
-          ../cocos2dx_support/CCBProxy.cpp \
-          ../cocos2dx_support/Lua_web_socket.cpp \
-          ../cocos2dx_support/LuaOpengl.cpp \
-          ../cocos2dx_support/LuaScriptHandlerMgr.cpp \
-          ../cocos2dx_support/LuaBasicConversions.cpp \
+LOCAL_SRC_FILES := CCLuaBridge.cpp \
+          CCLuaEngine.cpp \
+          CCLuaStack.cpp \
+          CCLuaValue.cpp \
+          Cocos2dxLuaLoader.cpp \
+          CCBProxy.cpp \
+          Lua_web_socket.cpp \
+          LuaOpengl.cpp \
+          LuaScriptHandlerMgr.cpp \
+          LuaBasicConversions.cpp \
           ../../auto-generated/lua-bindings/lua_cocos2dx_auto.cpp \
           ../../auto-generated/lua-bindings/lua_cocos2dx_extension_auto.cpp \
-          ../cocos2dx_support/lua_cocos2dx_manual.cpp \
-          ../cocos2dx_support/lua_cocos2dx_extension_manual.cpp \
-          ../cocos2dx_support/lua_cocos2dx_deprecated.cpp \
-          ../cocos2dx_support/platform/android/CCLuaJavaBridge.cpp \
-          ../cocos2dx_support/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp \
-          ../tolua/tolua_event.c \
-          ../tolua/tolua_is.c \
-          ../tolua/tolua_map.c \
-          ../tolua/tolua_push.c \
-          ../tolua/tolua_to.c \
-          ../cocos2dx_support/tolua_fix.c
+          lua_cocos2dx_manual.cpp \
+          lua_cocos2dx_extension_manual.cpp \
+          lua_cocos2dx_deprecated.cpp \
+          platform/android/CCLuaJavaBridge.cpp \
+          platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp \
+          ../../../../external/lua/tolua/tolua_event.c \
+          ../../../../external/lua/tolua/tolua_is.c \
+          ../../../../external/lua/tolua/tolua_map.c \
+          ../../../../external/lua/tolua/tolua_push.c \
+          ../../../../external/lua/tolua/tolua_to.c \
+          tolua_fix.c
 
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../luajit/include \
-                           $(LOCAL_PATH)/../tolua \
-                           $(LOCAL_PATH)/../cocos2dx_support \
-                           $(LOCAL_PATH)/../../auto-generated/lua-bindings \
-                           $(LOCAL_PATH)/../cocos2dx_support/platform/android \
-                           $(LOCAL_PATH)/../cocos2dx_support/platform/android/jni
-
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \
-                    $(LOCAL_PATH)/../luajit/include \
-                    $(LOCAL_PATH)/../tolua \
-                    $(LOCAL_PATH)/../../../cocos2dx \
-                    $(LOCAL_PATH)/../../../cocos2dx/include \
-                    $(LOCAL_PATH)/../../../cocos2dx/platform \
-                    $(LOCAL_PATH)/../../../cocos2dx/platform/android \
-                    $(LOCAL_PATH)/../../../cocos2dx/kazmath/include \
-                    $(LOCAL_PATH)/../../../CocosDenshion/include \
-                    $(LOCAL_PATH)/../../../extensions \
-                    $(LOCAL_PATH)/../cocos2dx_support \
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
                     $(LOCAL_PATH)/../../auto-generated/lua-bindings \
-                    $(LOCAL_PATH)/../cocos2dx_support/platform/android \
-                    $(LOCAL_PATH)/../cocos2dx_support/platform/android/jni
+                    $(LOCAL_PATH)/platform/android \
+                    $(LOCAL_PATH)/platform/android/jni \
+                    $(LOCAL_PATH)/../../../../extensions \
+                    $(LOCAL_PATH)/../../../editor-support/cocosbuilder \
+                    $(LOCAL_PATH)/../../../editor-support/cocostudio
+
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
 
 LOCAL_WHOLE_STATIC_LIBRARIES := luajit_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dx_static
+LOCAL_WHOLE_STATIC_LIBRARIES += websockets_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static
+LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
 
 LOCAL_CFLAGS += -Wno-psabi
 LOCAL_EXPORT_CFLAGS += -Wno-psabi
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,scripting/lua/luajit)
+$(call import-module,lua/luajit/prebuilt/android)
 $(call import-module,extensions)
+$(call import-module,2d)
+$(call import-module,websockets/prebuilt/android)
+$(call import-module,network)
+$(call import-module,editor-support/cocostudio)
+$(call import-module,editor-support/cocosbuilder)

cocos/scripting/lua/bindings/CCBProxy.h

@@ -4,7 +4,7 @@
 #include "cocos2d.h"
 #include "CCLuaEngine.h"
 #include "SimpleAudioEngine.h"
-#include "cocos-ext.h"
+#include "extensions/cocos-ext.h"
 #include "cocosbuilder/CocosBuilder.h"
 
 USING_NS_CC;

cocos/scripting/lua/bindings/LuaOpengl.cpp.REMOVED.git-id

@@ -1 +1 @@
-a57fbb5f0f9564858ced00cf47af905e6a7900c6
+4456a3ba6fbd68175b40e607c6bc19bdfc378ce1

cocos/scripting/lua/bindings/LuaScriptHandlerMgr.cpp

@@ -10,7 +10,7 @@ extern "C" {
 #include <string>
 #include "LuaScriptHandlerMgr.h"
 #include "cocos2d.h"
-#include "cocos-ext.h"
+#include "extensions/cocos-ext.h"
 #include "CCLuaStack.h"
 #include "CCLuaValue.h"
 #include "CCLuaEngine.h"

cocos/storage/local-storage/Android.mk

@@ -1,19 +1,24 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := localstorage_static
+LOCAL_MODULE := cocos_localstorage_static
 
 LOCAL_MODULE_FILENAME := liblocalstorage
 
-LOCAL_SRC_FILES := LocalStorage.cpp
-LocalStorageAndroid.cpp \
+LOCAL_SRC_FILES := LocalStorage.cpp \
+LocalStorageAndroid.cpp 
 
 
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/..
+
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../2d
 
 LOCAL_CFLAGS += -Wno-psabi
 LOCAL_EXPORT_CFLAGS += -Wno-psabi
 
+LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
+
 include $(BUILD_STATIC_LIBRARY)
+
+$(call import-module,2d)

external/lua/luajit/prebuilt/android/Android.mk

@@ -3,6 +3,6 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE    := luajit_static
 LOCAL_MODULE_FILENAME := libluajit
-LOCAL_SRC_FILES := ./android/$(TARGET_ARCH_ABI)/libluajit.a
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libluajit.a
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
 include $(PREBUILT_STATIC_LIBRARY)