Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-01-27 08:12:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

atlastool buildfix (yeah, it's still a mess to build, I know)

Browse Source
This commit is contained in:
Henrik Rydgard 2014-07-23 12:50:03 +02:00
parent 9f4f49be66
commit 79d189b545
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/atlastool.cpp
View File

@ -14,7 +14,12 @@
#include <libpng17/png.h>
#include <ft2build.h>
#include FT_FREETYPE_H
#ifdef _WIN32
// Hackery for our broken path structure
#include <ftbitmap.h>
#else
#include <freetype/ftbitmap.h>
#endif
#include <set>
#include <map>
#include <vector>
@ -363,8 +368,9 @@ void RasterizeFonts(const FontReferenceList fontRefs, vector<CharRange> &ranges,
for (size_t i = 0, n = fontRefs.size(); i < n; ++i) {
FT_Face &font = fonts[i];
if (FT_New_Face(freetype, fontRefs[i].file_.c_str(), 0, &font) != 0) {
printf("Failed to load file %s\n", fontRefs[i].file_.c_str());
CHECK(false);
printf("Failed to load font file %s\n", fontRefs[i].file_.c_str());
printf("bailing");
exit(0);
}
printf("TTF info: %d glyphs, %08x flags, %d units, %d strikes\n", (int)font->num_glyphs, (int)font->face_flags, (int)font->units_per_EM, (int)font->num_fixed_sizes);

4
tools/atlastool/atlastool.vcxproj
View File

@ -53,7 +53,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\ext\libpng17;..\..\..\ext\freetype\devel;..\..\..\ext\freetype\include;..\..;..\..\ext\SDL1.2\include;..\..\..\libpng;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\ext;..\..\..\ext\freetype\devel;..\..\..\ext\freetype\include;..\..;..\..\ext\SDL1.2\include;..\..\..\libpng;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -72,7 +72,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\ext\libpng17;..\..\..\ext\freetype\devel;..\..\..\ext\freetype\include;..\..;..\..\ext\SDL1.2\include;..\..\..\libpng;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\ext;..\..\..\ext\freetype\devel;..\..\..\ext\freetype\include;..\..;..\..\ext\SDL1.2\include;..\..\..\libpng;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>