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

Merge remote-tracking branch 'refs/remotes/origin/patch-spine' into patch-spine

This commit is contained in:
flaming0 2013-06-03 20:53:17 +04:00
parent a6c2ad0666 6f0f53cf84
commit 92b1da1fce
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/Android.mk
View File

@ -69,6 +69,8 @@ spine/Skin.cpp \
spine/Slot.cpp \ spine/Slot.cpp \
spine/SlotData.cpp \ spine/SlotData.cpp \
spine/extension.cpp \ spine/extension.cpp \
spine/CCSkeletonAnimation.cpp \
spine/CCSkeleton.cpp \
spine/spine-cocos2dx.cpp spine/spine-cocos2dx.cpp
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static

2
extensions/proj.nacl/Makefile
View File

@ -59,6 +59,8 @@ EXTENSIONS_SOURCES = ../CCBReader/CCBFileLoader.cpp \
../spine/Slot.cpp \ ../spine/Slot.cpp \
../spine/SlotData.cpp \ ../spine/SlotData.cpp \
../spine/extension.cpp \ ../spine/extension.cpp \
../spine/CCSkeleton.cpp \
../spine/CCSkeletonAnimation.cpp \
../spine/spine-cocos2dx.cpp ../spine/spine-cocos2dx.cpp
all: all: