diff --git a/cocos2dx/platform/emscripten/CCImage.cpp b/cocos2dx/platform/emscripten/CCImage.cpp index 69935f0c5f..00fb16880b 100644 --- a/cocos2dx/platform/emscripten/CCImage.cpp +++ b/cocos2dx/platform/emscripten/CCImage.cpp @@ -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*/) { diff --git a/cocos2dx/proj.emscripten/Makefile b/cocos2dx/proj.emscripten/Makefile index 50987c8847..233981553a 100644 --- a/cocos2dx/proj.emscripten/Makefile +++ b/cocos2dx/proj.emscripten/Makefile @@ -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 \ diff --git a/extensions/proj.emscripten/Makefile b/extensions/proj.emscripten/Makefile index 1d6c663a08..840e7564a5 100644 --- a/extensions/proj.emscripten/Makefile +++ b/extensions/proj.emscripten/Makefile @@ -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