diff --git a/tools/atlastool.cpp b/tools/atlastool.cpp index 4102b44f72..874a28b4f5 100644 --- a/tools/atlastool.cpp +++ b/tools/atlastool.cpp @@ -14,7 +14,12 @@ #include #include #include FT_FREETYPE_H +#ifdef _WIN32 +// Hackery for our broken path structure +#include +#else #include +#endif #include #include #include @@ -363,8 +368,9 @@ void RasterizeFonts(const FontReferenceList fontRefs, vector &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); diff --git a/tools/atlastool/atlastool.vcxproj b/tools/atlastool/atlastool.vcxproj index da873d853f..24469ad637 100644 --- a/tools/atlastool/atlastool.vcxproj +++ b/tools/atlastool/atlastool.vcxproj @@ -53,7 +53,7 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\ext\libpng17;..\..\..\ext\freetype\devel;..\..\..\ext\freetype\include;..\..;..\..\ext\SDL1.2\include;..\..\..\libpng;%(AdditionalIncludeDirectories); + ..\..\ext;..\..\..\ext\freetype\devel;..\..\..\ext\freetype\include;..\..;..\..\ext\SDL1.2\include;..\..\..\libpng;%(AdditionalIncludeDirectories); Console @@ -72,7 +72,7 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..\ext\libpng17;..\..\..\ext\freetype\devel;..\..\..\ext\freetype\include;..\..;..\..\ext\SDL1.2\include;..\..\..\libpng;%(AdditionalIncludeDirectories); + ..\..\ext;..\..\..\ext\freetype\devel;..\..\..\ext\freetype\include;..\..;..\..\ext\SDL1.2\include;..\..\..\libpng;%(AdditionalIncludeDirectories); Console