diff --git a/cocos2dx/proj.linux/Makefile b/cocos2dx/proj.linux/Makefile index 86b429cd2a..d741870c18 100644 --- a/cocos2dx/proj.linux/Makefile +++ b/cocos2dx/proj.linux/Makefile @@ -104,6 +104,7 @@ OBJECTS = ../actions/CCAction.o \ ../sprite_nodes/CCSpriteBatchNode.o \ ../sprite_nodes/CCSpriteFrame.o \ ../sprite_nodes/CCSpriteFrameCache.o \ +../support/ccUTF8.o \ ../support/CCPointExtension.o \ ../support/CCProfiling.o \ ../support/CCUserDefault.o \ diff --git a/cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id b/cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id index fc1091c2d2..677b1d3b33 100644 --- a/cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -4f8a2ffda386a2d2e263781a283c32d39b6dc6a7 \ No newline at end of file +cc07100d26f9435ecf7b2588f14adb3d22980883 \ No newline at end of file diff --git a/cocos2dx/proj.marmalade/cocos2dx.mkf b/cocos2dx/proj.marmalade/cocos2dx.mkf index cec3bb8747..7ea9c89697 100644 --- a/cocos2dx/proj.marmalade/cocos2dx.mkf +++ b/cocos2dx/proj.marmalade/cocos2dx.mkf @@ -156,35 +156,29 @@ files [sprite_nodes] "*.h" "*.cpp" - - ("../support") - [support] - "base64.cpp" - "base64.h" -# "CCArray.cpp" - "CCPointExtension.cpp" - "CCProfiling.cpp" - "CCProfiling.h" - "CCUserDefault.cpp" - "ccUtils.cpp" - "ccUtils.h" - "TransformUtils.cpp" - "TransformUtils.h" ("../support") [support] "*.h" "*.cpp" + ("../support/data_support") + [support/data_support] "*.cpp" # MH: Many ccCArray linker errors without ccCArray.cpp "*.h" - ("../support/image_support") + + ("../support/image_support") + [support/image_support] "*.h" "*.cpp" - ("../support/tinyxml2") - "*.h" - "*.cpp" + + ("../support/tinyxml2") + [support/tinyxml2] + "*.h" + "*.cpp" + ("../support/zip_support") + [support/zip_support] "*.h" "*.cpp"