Permalink
Browse files

IOS support latest freetype lib (2.4.11)

Conflicts:

	project/third-party/lib/Mac/libfreetype.a
	project/third-party/lib/iPhone/libfreetype.iphoneos-v7.a
  • Loading branch information...
1 parent a6ea788 commit 631b7caa7370ba5c59d3f669bab17d3cfe9f35a0 @grapefrukt grapefrukt committed Mar 20, 2013
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -204,7 +204,7 @@
<file name="common/CachedExtent.cpp"/>
<file name="common/TextField.cpp"/>
<file name="common/Font.cpp"/>
- <file name="common/FreeType.cpp" unless="iphone"/>
+ <file name="common/FreeType.cpp" />
<file name="common/Tilesheet.cpp"/>
<file name="common/Display.cpp"/>
<file name="common/ColorTransform.cpp"/>
@@ -351,6 +351,7 @@
<files id="webos" if="webos"/>
<files id="blackberry" if="blackberry"/>
+ <lib name="${THIRDPARTY_LIBS}libfreetype${name_extra}${SLIBEXT}" if="iphone"/>
<lib name="${THIRDPARTY_LIBS}libfreetype${name_extra}${SLIBEXT}" unless="no_thirdparty_extras"/>
<lib name="${THIRDPARTY_LIBS}libjpeg${name_extra}${SLIBEXT}" unless="no_thirdparty_extras"/>
<lib name="${THIRDPARTY_LIBS}libpng${name_extra}${SLIBEXT}" unless="no_thirdparty_extras"/>
View
@@ -396,11 +396,8 @@ Font *Font::Create(TextFormat &inFormat,double inScale,GlyphRotation inRotation,
if (!face && inNative)
face = FontFace::CreateNative(inFormat,inScale);
-
- #ifndef IPHONE
if (!face)
face = FontFace::CreateFreeType(inFormat,inScale);
- #endif
if (!face && !inNative)
face = FontFace::CreateNative(inFormat,inScale);
@@ -341,7 +341,7 @@ static void mapCharactersToGlyphsInFont(const fontTable *table, unichar characte
mFont = [UIFont fontWithName:str size:inHeight];
//printf("Font name : %s = %p\n", name.c_str(), str);
- if (!mFont)
+ /*if (!mFont)
{
//printf("Trying font from file %s ...\n", [str UTF8String]);
// Could not find installed font - try one in file...
@@ -362,7 +362,7 @@ static void mapCharactersToGlyphsInFont(const fontTable *table, unichar characte
}
}
- }
+ }*/
}
if (mFont)
@@ -257,6 +257,7 @@ class IOSPlatform implements IPlatformTool {
project.ndlls.push (new NDLL ("curl_ssl", nmeLib, false));
project.ndlls.push (new NDLL ("png", nmeLib, false));
project.ndlls.push (new NDLL ("jpeg", nmeLib, false));
+ project.ndlls.push (new NDLL ("freetype", nmeLib, false));
for (asset in project.assets) {

0 comments on commit 631b7ca

Please sign in to comment.