Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes

into 3.6
EsotericSoftware · Nov 13, 2017 · adb11a2 · adb11a2
2 parents fe26844 + 4850cb7
commit adb11a2
Showing 1 changed file with 20 additions and 15 deletions.
diff --git a/spine-cocos2dx/example/proj.android/jni/Android.mk b/spine-cocos2dx/example/proj.android/jni/Android.mk
@@ -12,21 +12,26 @@ LOCAL_MODULE := MyGame_shared
 LOCAL_MODULE_FILENAME := libMyGame
 
 LOCAL_SRC_FILES := hellocpp/main.cpp \
-                   ../../Classes/AppDelegate.cpp \
-                   ../../Classes/BatchingExample.cpp \
-                   ../../Classes/GoblinsExample.cpp \
-                   ../../Classes/RaptorExample.cpp \
-                   ../../Classes/SimpleCommand.cpp \
-                   ../../Classes/SpineboyExample.cpp \
-                   ../../Classes/TankExample.cpp \
-                   ../../../src/spine/AttachmentVertices.cpp \
-                   ../../../src/spine/Cocos2dAttachmentLoader.cpp \
-                   ../../../src/spine/SkeletonAnimation.cpp \
-                   ../../../src/spine/SkeletonBatch.cpp \
-                   ../../../src/spine/SkeletonTwoColorBatch.cpp \
-                   ../../../src/spine/SkeletonRenderer.cpp \
-                   ../../../src/spine/spine-cocos2dx.cpp \
-                   ../../../../spine-c/spine-c/src/spine/Animation.c \
+				   ../../Classes/AppDelegate.cpp \
+				   ../../Classes/BatchingExample.cpp \
+				   ../../Classes/GoblinsExample.cpp \
+				   ../../Classes/RaptorExample.cpp \
+				   ../../Classes/SimpleCommand.cpp \
+				   ../../Classes/SpineboyExample.cpp \
+				   ../../Classes/CoinExample.cpp \
+				   ../../Classes/TankExample.cpp \
+				   ../../../src/spine/AttachmentVertices.cpp \
+				   ../../../src/spine/Cocos2dAttachmentLoader.cpp \
+				   ../../../src/spine/SkeletonAnimation.cpp \
+				   ../../../src/spine/SkeletonBatch.cpp \
+				   ../../../src/spine/SkeletonTwoColorBatch.cpp \
+				   ../../../src/spine/SkeletonRenderer.cpp \
+				   ../../../src/spine/spine-cocos2dx.cpp \
+				   ../../../../spine-c/spine-c/src/spine/Animation.c \
+				   ../../../../spine-c/spine-c/src/spine/ClippingAttachment.c \
+				   ../../../../spine-c/spine-c/src/spine/SkeletonClipping.c \
+				   ../../../../spine-c/spine-c/src/spine/Triangulator.c \
+				   ../../../../spine-c/spine-c/src/spine/Array.c \
 				   ../../../../spine-c/spine-c/src/spine/AnimationState.c \
 				   ../../../../spine-c/spine-c/src/spine/AnimationStateData.c \
 				   ../../../../spine-c/spine-c/src/spine/Atlas.c \