Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test

Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-23 20:28:51 +08:00 · 2013-12-23 20:28:51 +08:00 · cafebe7295
parent 92ee688b73 d5ea2d22a5
commit cafebe7295
10 changed files with 67 additions and 5 deletions
--- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
@ -1 +1 @@
-1df2ba5492ecdbe0c160d2429733c1371b35b21a
+6a1d93a1ba436e37c697fe32704a230cf9784e18
--- a/cocos/2d/Android.mk
+++ b/cocos/2d/Android.mk
@ -210,6 +210,7 @@ LOCAL_EXPORT_LDLIBS := -lGLESv2 \
 LOCAL_WHOLE_STATIC_LIBRARIES := cocos_freetype2_static
 LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
 LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
+LOCAL_WHOLE_STATIC_LIBRARIES += spine_static

 # define the macro to compile through support/zip_support/ioapi.c
 LOCAL_CFLAGS   := -Wno-psabi  -DUSE_FILE32API
@ -222,3 +223,4 @@ include $(BUILD_STATIC_LIBRARY)
 $(call import-module,freetype2/prebuilt/android)
 $(call import-module,chipmunk)
 $(call import-module,2d/platform/android)
+$(call import-module,editor-support/spine)
--- a/cocos/scripting/javascript/bindings/Android.mk
+++ b/cocos/scripting/javascript/bindings/Android.mk
@ -14,7 +14,8 @@ LOCAL_SRC_FILES := ScriptingCore.cpp \
                   jsb_opengl_functions.cpp \
                   jsb_opengl_manual.cpp \
                   jsb_opengl_registration.cpp \
-                   ../../auto-generated/js-bindings/jsb_cocos2dx_auto.cpp
+                   ../../auto-generated/js-bindings/jsb_cocos2dx_auto.cpp \
+                   ../../auto-generated/js-bindings/jsb_cocos2dx_spine_auto.cpp

 LOCAL_CFLAGS := -DCOCOS2D_JAVASCRIPT

@ -24,7 +25,10 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
                    $(LOCAL_PATH)/../../../audio/include \
                    $(LOCAL_PATH)/../../../storage \
                    $(LOCAL_PATH)/../../auto-generated/js-bindings \
-                    $(LOCAL_PATH)/../../../../extensions
+                    $(LOCAL_PATH)/../../../../extensions \
+                    $(LOCAL_PATH)/../../../editor-support/spine \
+                    $(LOCAL_PATH)/../../../editor-support
+

 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \
                           $(LOCAL_PATH)/../../auto-generated/js-bindings \
--- a/cocos/scripting/javascript/bindings/proj.win32/libJSBinding.vcxproj
+++ b/cocos/scripting/javascript/bindings/proj.win32/libJSBinding.vcxproj
@ -12,6 +12,7 @@
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_auto.cpp" />
+    <ClCompile Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_spine_auto.cpp" />
    <ClCompile Include="..\cocos2d_specifics.cpp" />
    <ClCompile Include="..\jsb_opengl_functions.cpp" />
    <ClCompile Include="..\jsb_opengl_manual.cpp" />
@ -23,6 +24,7 @@
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_auto.hpp" />
+    <ClInclude Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_spine_auto.hpp" />
    <ClInclude Include="..\cocos2d_specifics.hpp" />
    <ClInclude Include="..\jsb_helper.h" />
    <ClInclude Include="..\jsb_opengl_functions.h" />
--- a/cocos/scripting/javascript/bindings/proj.win32/libJSBinding.vcxproj.filters
+++ b/cocos/scripting/javascript/bindings/proj.win32/libJSBinding.vcxproj.filters
@ -41,6 +41,9 @@
    <ClCompile Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_auto.cpp">
      <Filter>generated</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_spine_auto.cpp">
+      <Filter>generated</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\cocos2d_specifics.hpp">
@ -79,6 +82,9 @@
    <ClInclude Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_auto.hpp">
      <Filter>generated</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_spine_auto.hpp">
+      <Filter>generated</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\..\..\auto-generated\js-bindings\jsb_cocos2dx_auto_api.js">
--- a/samples/Javascript/TestJavascript/Classes/AppDelegate.cpp
+++ b/samples/Javascript/TestJavascript/Classes/AppDelegate.cpp
@ -8,6 +8,7 @@
 #include "jsb_cocos2dx_builder_auto.hpp"
 #include "jsb_cocos2dx_studio_auto.hpp"
 #include "jsb_cocos2dx_gui_auto.hpp"
+#include "jsb_cocos2dx_spine_auto.hpp"
 #include "extension/jsb_cocos2dx_extension_manual.h"
 #include "cocostudio/jsb_cocos2dx_studio_manual.h"
 #include "gui/jsb_cocos2dx_gui_manual.h"
@ -70,6 +71,8 @@ bool AppDelegate::applicationDidFinishLaunching()
    sc->addRegisterCallback(register_all_cocos2dx_studio);
    sc->addRegisterCallback(register_all_cocos2dx_studio_manual);
    
+    sc->addRegisterCallback(register_all_cocos2dx_spine);
+    
    sc->start();
    
 #if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0)
--- a/template/multi-platform-js/Classes/AppDelegate.cpp
+++ b/template/multi-platform-js/Classes/AppDelegate.cpp
@ -5,6 +5,7 @@
 #include "ScriptingCore.h"
 #include "jsb_cocos2dx_auto.hpp"
 #include "jsb_cocos2dx_extension_auto.hpp"
+#include "jsb_cocos2dx_spine_auto.hpp"
 #include "cocos2d_specifics.hpp"
 #include "extension/jsb_cocos2dx_extension_manual.h"
 #include "chipmunk/js_bindings_chipmunk_registration.h"
@ -40,6 +41,7 @@ bool AppDelegate::applicationDidFinishLaunching()
    sc->addRegisterCallback(register_all_cocos2dx_extension);
    sc->addRegisterCallback(register_cocos2dx_js_extensions);
    sc->addRegisterCallback(register_all_cocos2dx_extension_manual);
+    sc->addRegisterCallback(register_all_cocos2dx_spine);
    sc->addRegisterCallback(jsb_register_chipmunk);
    sc->addRegisterCallback(JSB_register_opengl);
    sc->addRegisterCallback(jsb_register_system);
--- a/template/multi-platform-js/proj.android/jni/Android.mk
+++ b/template/multi-platform-js/proj.android/jni/Android.mk
@ -24,4 +24,4 @@ include $(BUILD_SHARED_LIBRARY)
 $(call import-module,scripting/javascript/bindings)
 $(call import-module,scripting/javascript/bindings/extension)
 $(call import-module,scripting/javascript/bindings/chipmunk)
-$(call import-module,scripting/javascript/bindings/localstorage)
+$(call import-module,scripting/javascript/bindings/localstorage)
--- a/tools/tojs/cocos2dx_spine.ini
+++ b/tools/tojs/cocos2dx_spine.ini
@ -0,0 +1,40 @@
+[cocos2dx_spine]
+prefix = cocos2dx_spine
+
+target_namespace = cc
+
+android_headers = -I%(androidndkdir)s/platforms/android-14/arch-arm/usr/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/include
+android_flags = -D_SIZE_T_DEFINED_ 
+
+clang_headers = -I%(clangllvmdir)s/lib/clang/3.3/include 
+clang_flags = -nostdinc -x c++ -std=c++11
+
+cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/2d -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/gui -I%(cocosdir)s/cocos/physics -I%(cocosdir)s/cocos/2d/platform -I%(cocosdir)s/cocos/2d/platform/android -I%(cocosdir)s/cocos/math/kazmath/include -I%(cocosdir)s/extensions -I%(cocosdir)s/external -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s
+
+cocos_flags = -DANDROID -DCOCOS2D_JAVASCRIPT
+
+cxxgenerator_headers = 
+
+# extra arguments for clang
+extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s 
+
+headers = %(cocosdir)s/cocos/editor-support/spine/spine-cocos2dx.h
+
+skip = CCSkeleton::[createWithData],
+		CCSkeletonAnimation::[createWithData]
+
+classes = CCSkeleton CCSkeletonAnimation
+
+remove_prefix = CC
+
+classes_have_no_parents =
+
+base_classes_to_skip =
+
+abstract_classes =
+
+script_control_cpp =
+
+rename_functions =
+
+rename_classes =
--- a/tools/tojs/genbindings.sh
+++ b/tools/tojs/genbindings.sh
@ -92,4 +92,7 @@ echo "Generating bindings for cocos2dx_gui..."
 LD_LIBRARY_PATH=${CLANG_ROOT}/lib $PYTHON_BIN ${CXX_GENERATOR_ROOT}/generator.py ${TO_JS_ROOT}/cocos2dx_gui.ini -s cocos2dx_gui -t spidermonkey -o ${COCOS2DX_ROOT}/cocos/scripting/auto-generated/js-bindings -n jsb_cocos2dx_gui_auto

 echo "Generating bindings for cocos2dx_studio..."
-LD_LIBRARY_PATH=${CLANG_ROOT}/lib $PYTHON_BIN ${CXX_GENERATOR_ROOT}/generator.py ${TO_JS_ROOT}/cocos2dx_studio.ini -s cocos2dx_studio -t spidermonkey -o ${COCOS2DX_ROOT}/cocos/scripting/auto-generated/js-bindings -n jsb_cocos2dx_studio_auto
+LD_LIBRARY_PATH=${CLANG_ROOT}/lib $PYTHON_BIN ${CXX_GENERATOR_ROOT}/generator.py ${TO_JS_ROOT}/cocos2dx_studio.ini -s cocos2dx_studio -t spidermonkey -o ${COCOS2DX_ROOT}/cocos/scripting/auto-generated/js-bindings -n jsb_cocos2dx_studio_auto
+
+echo "Generating bindings for cocos2dx_spine..."
+LD_LIBRARY_PATH=${CLANG_ROOT}/lib $PYTHON_BIN ${CXX_GENERATOR_ROOT}/generator.py ${TO_JS_ROOT}/cocos2dx_spine.ini -s cocos2dx_spine -t spidermonkey -o ${COCOS2DX_ROOT}/cocos/scripting/auto-generated/js-bindings -n jsb_cocos2dx_spine_auto