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

Fix ci

This commit is contained in:
halx99 2022-06-11 16:21:47 +08:00
parent abc1355dd6
commit 345c9e11f9
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/2d/CCFontAtlas.cpp
View File

@ -27,7 +27,6 @@
#include "2d/CCFontAtlas.h" #include "2d/CCFontAtlas.h"
#if CC_TARGET_PLATFORM != CC_PLATFORM_WIN32 && CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID #if CC_TARGET_PLATFORM != CC_PLATFORM_WIN32 && CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID
# include <iconv.h>
#elif CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID #elif CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
# include "platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" # include "platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h"
#endif #endif
@ -125,14 +124,6 @@ FontAtlas::~FontAtlas()
releaseTextures(); releaseTextures();
delete[] _currentPageData; delete[] _currentPageData;
#if CC_TARGET_PLATFORM != CC_PLATFORM_WIN32 && CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID
if (_iconv)
{
iconv_close(_iconv);
_iconv = nullptr;
}
#endif
} }
void FontAtlas::initTextureWithZeros(Texture2D* texture) void FontAtlas::initTextureWithZeros(Texture2D* texture)

1
core/2d/CCFontAtlas.h
View File

@ -138,7 +138,6 @@ protected:
float _lineHeight = 0.f; float _lineHeight = 0.f;
Font* _font = nullptr; Font* _font = nullptr;
FontFreeType* _fontFreeType = nullptr; FontFreeType* _fontFreeType = nullptr;
void* _iconv = nullptr;
// Dynamic GlyphCollection related stuff // Dynamic GlyphCollection related stuff
int _currentPage = 0; int _currentPage = 0;