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

[emscripten] Fixing compilation errors.

This commit is contained in:
James Chen 2013-07-29 16:33:34 +08:00
parent 4c32303b2e
commit a76f556fb2
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos2dx/platform/emscripten/CCImage.cpp
View File

@ -130,7 +130,7 @@ public:
* while -1 means fail
*
*/
int computeLineStart(TTF_Font *face, Image::ETextAlign eAlignMask, char cText,
int computeLineStart(TTF_Font *face, Image::TextAlign eAlignMask, char cText,
int iLineIndex) {
return 0;
/*
@ -156,7 +156,7 @@ public:
*/
}
int computeLineStartY( TTF_Font *face, Image::ETextAlign eAlignMask, int txtHeight, int borderHeight ){
int computeLineStartY( TTF_Font *face, Image::TextAlign eAlignMask, int txtHeight, int borderHeight ){
return 0;
/*
int iRet;
@ -178,7 +178,7 @@ public:
*/
}
bool getBitmap(const char *text, int nWidth, int nHeight, Image::ETextAlign eAlignMask, const char * pFontName, float fontSize) {
bool getBitmap(const char *text, int nWidth, int nHeight, Image::TextAlign eAlignMask, const char * pFontName, float fontSize) {
const char* pText = text;
int pxSize = (int)fontSize;
@ -284,7 +284,7 @@ bool Image::initWithString(
const char * pText,
int nWidth/* = 0*/,
int nHeight/* = 0*/,
ETextAlign eAlignMask/* = kAlignCenter*/,
TextAlign eAlignMask/* = kAlignCenter*/,
const char * pFontName/* = nil*/,
int nSize/* = 0*/)
{

1
cocos2dx/proj.emscripten/Makefile
View File

@ -66,7 +66,6 @@ SOURCES = ../actions/CCAction.cpp \
../particle_nodes/CCParticleBatchNode.cpp \
../platform/CCSAXParser.cpp \
../platform/CCThread.cpp \
../platform/platform.cpp \
../platform/CCImageCommonWebp.cpp \
../platform/CCEGLViewProtocol.cpp \
../platform/CCFileUtils.cpp \

2
extensions/proj.emscripten/Makefile
View File

@ -88,7 +88,7 @@ SOURCES = ../CCBReader/CCBFileLoader.cpp \
../CCArmature/utils/CCTransformHelp.cpp \
../CCArmature/utils/CCTweenFunction.cpp \
../CCArmature/utils/CCUtilMath.cpp \
../CCDprecated-ext.cpp
../CCDeprecated-ext.cpp
include $(COCOS_ROOT)/cocos2dx/proj.emscripten/cocos2dx.mk