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

Merge pull request #4373 from lajos/dev_macfonttest 

closed #3275: Adding FontTest for Mac
This commit is contained in:
James Chen 2013-11-25 17:50:53 -08:00
parent 9ebc4e3722 4538be2b43
commit 10e983707e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/Cpp/TestCpp/Classes/FontTest/FontTest.cpp
View File

@ -16,7 +16,7 @@ static int fontIdx = 0;
static std::string fontList[] =
{
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
#if ((CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC))
// custom ttf files are defined in Test-info.plist
"American Typewriter",
"Marker Felt",