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

fixed #1753: Adding ccUTF8.h/.cpp for MAC, LINUX and MARMALADE port.

This commit is contained in:
James Chen 2013-02-28 09:44:37 +08:00
parent 3a465739c3
commit 3f74cd8190
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos2dx/proj.linux/Makefile
View File

@ -104,6 +104,7 @@ OBJECTS = ../actions/CCAction.o \
../sprite_nodes/CCSpriteBatchNode.o \ ../sprite_nodes/CCSpriteBatchNode.o \
../sprite_nodes/CCSpriteFrame.o \ ../sprite_nodes/CCSpriteFrame.o \
../sprite_nodes/CCSpriteFrameCache.o \ ../sprite_nodes/CCSpriteFrameCache.o \
../support/ccUTF8.o \
../support/CCPointExtension.o \ ../support/CCPointExtension.o \
../support/CCProfiling.o \ ../support/CCProfiling.o \
../support/CCUserDefault.o \ ../support/CCUserDefault.o \

2
cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
4f8a2ffda386a2d2e263781a283c32d39b6dc6a7 cc07100d26f9435ecf7b2588f14adb3d22980883

30
cocos2dx/proj.marmalade/cocos2dx.mkf
View File

@ -157,34 +157,28 @@ files
"*.h" "*.h"
"*.cpp" "*.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")
[support] [support]
"*.h" "*.h"
"*.cpp" "*.cpp"
("../support/data_support") ("../support/data_support")
[support/data_support]
"*.cpp" # MH: Many ccCArray linker errors without ccCArray.cpp "*.cpp" # MH: Many ccCArray linker errors without ccCArray.cpp
"*.h" "*.h"
("../support/image_support")
("../support/image_support")
[support/image_support]
"*.h" "*.h"
"*.cpp" "*.cpp"
("../support/tinyxml2")
"*.h" ("../support/tinyxml2")
"*.cpp" [support/tinyxml2]
"*.h"
"*.cpp"
("../support/zip_support") ("../support/zip_support")
[support/zip_support]
"*.h" "*.h"
"*.cpp" "*.cpp"