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

issue #2179: Fixing compilation errors on Linux.

This commit is contained in:
James Chen 2013-08-05 10:29:20 +08:00
parent 5ee6e7d79a
commit a2fbf0c2b8
5 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/label_nodes/CCFontDefinition.cpp
View File

@ -192,7 +192,7 @@ Texture2D * FontDefinitionTTF::getTexture(int index)
TextFontPagesDef *pPages = _textImages->getPages();
if (!pPages)
return (false);
return nullptr;
return pPages->getPageAt(index)->getPageTexture();
}

2
cocos2dx/label_nodes/CCLabelTextFormatter.h
View File

@ -25,7 +25,7 @@
#ifndef _CCLabelTextFormatter_h_
#define _CCLabelTextFormatter_h_
#include "CClabelTextFormatProtocol.h"
#include "CCLabelTextFormatProtocol.h"
NS_CC_BEGIN

2
cocos2dx/label_nodes/CCStringBMFont.h
View File

@ -36,7 +36,7 @@ Use any of these editors to generate BMFonts:
#include "sprite_nodes/CCSpriteBatchNode.h"
#include "support/data_support/uthash.h"
#include "CCLabelBMFont.h"
#include "CClabelTextFormatProtocol.h"
#include "CCLabelTextFormatProtocol.h"
#include <map>
#include <sstream>
#include <iostream>

2
cocos2dx/label_nodes/CCTextImage.cpp
View File

@ -296,7 +296,7 @@ bool TextImage::createPageDefinitions(unsigned short int *inText, int imageWidth
int TextImage::getNumGlyphsFittingInSize(std::map<unsigned short int, GlyphDef> &glyphDefs, unsigned short int *strUTF8, Font *pFont, Size *constrainSize, int &outNewSize)
{
if (!strUTF8)
return NULL;
return 0;
float widthWithBBX = 0.0f;
float lastWidth = 0.0f;

14
cocos2dx/proj.linux/Makefile
View File

@ -44,9 +44,23 @@ SOURCES = ../actions/CCAction.cpp \
../keypad_dispatcher/CCKeypadDelegate.cpp \
../keypad_dispatcher/CCKeypadDispatcher.cpp \
../keyboard_dispatcher/CCKeyboardDispatcher.cpp \
../label_nodes/CCFont.cpp \
../label_nodes/CCFontAtlas.cpp \
../label_nodes/CCFontAtlasCache.cpp \
../label_nodes/CCFontAtlasFactory.cpp \
../label_nodes/CCFontCache.cpp \
../label_nodes/CCFontDefinition.cpp \
../label_nodes/CCFontFNT.cpp \
../label_nodes/CCFontFreeType.cpp \
../label_nodes/CCFontRenderFreeType.cpp \
../label_nodes/CCLabel.cpp \
../label_nodes/CCLabelAtlas.cpp \
../label_nodes/CCLabelBMFont.cpp \
../label_nodes/CCLabelTTF.cpp \
../label_nodes/CCLabelTextFormatter.cpp \
../label_nodes/CCStringBMFont.cpp \
../label_nodes/CCStringTTF.cpp \
../label_nodes/CCTextImage.cpp \
../layers_scenes_transitions_nodes/CCLayer.cpp \
../layers_scenes_transitions_nodes/CCScene.cpp \
../layers_scenes_transitions_nodes/CCTransition.cpp \