From f6495a64fb5e7a5d505ad81d56b34c3480f2a2dc Mon Sep 17 00:00:00 2001 From: flamingo Date: Sun, 2 Jun 2013 20:18:27 +0400 Subject: [PATCH 1/3] Update Android.mk --- extensions/Android.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/Android.mk b/extensions/Android.mk index c410362b97..fc734773ab 100644 --- a/extensions/Android.mk +++ b/extensions/Android.mk @@ -69,6 +69,8 @@ spine/Skin.cpp \ spine/Slot.cpp \ spine/SlotData.cpp \ spine/extension.cpp \ +spine/CCSkeleton.cpp \ +spine/CCSkeletonAnimation.cpp \ spine/spine-cocos2dx.cpp LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static From 6d7e4f5229b8180459ff90994a2e1d26fbfeb866 Mon Sep 17 00:00:00 2001 From: flamingo Date: Sun, 2 Jun 2013 20:19:12 +0400 Subject: [PATCH 2/3] Update Makefile For nacl (spine runtime) --- extensions/proj.nacl/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/proj.nacl/Makefile b/extensions/proj.nacl/Makefile index 06960a376b..f5621ea907 100644 --- a/extensions/proj.nacl/Makefile +++ b/extensions/proj.nacl/Makefile @@ -59,6 +59,8 @@ EXTENSIONS_SOURCES = ../CCBReader/CCBFileLoader.cpp \ ../spine/Slot.cpp \ ../spine/SlotData.cpp \ ../spine/extension.cpp \ +../spine/CCSkeleton.cpp \ +../spine/CCSkeletonAnimation.cpp \ ../spine/spine-cocos2dx.cpp all: From 6f0f53cf8425cc8ebc9bf34daf4b4d664d314407 Mon Sep 17 00:00:00 2001 From: flamingo Date: Sun, 2 Jun 2013 20:42:48 +0400 Subject: [PATCH 3/3] Update Android.mk --- extensions/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/Android.mk b/extensions/Android.mk index fc734773ab..2505aff07e 100644 --- a/extensions/Android.mk +++ b/extensions/Android.mk @@ -69,8 +69,8 @@ spine/Skin.cpp \ spine/Slot.cpp \ spine/SlotData.cpp \ spine/extension.cpp \ -spine/CCSkeleton.cpp \ spine/CCSkeletonAnimation.cpp \ +spine/CCSkeleton.cpp \ spine/spine-cocos2dx.cpp LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static