mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Make the choice between the freetype and fontconfig listers entirely based on the defined setttings rather than platform

Browse source 
Originally committed to SVN as r4822.
This commit is contained in:
Thomas Goyne 2010-10-20 01:56:22 +00:00
parent da7f1ef96c
commit 7189dfb1a1
3 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
aegisub/src/font_file_lister.cpp
View file

@ -44,18 +44,14 @@
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#endif #endif
#if defined(__WINDOWS__) || defined(__APPLE__)
#ifdef WITH_FREETYPE2 #ifdef WITH_FREETYPE2
#include "font_file_lister_freetype.h" #include "font_file_lister_freetype.h"
/// DOCME
#define FontListerClass FreetypeFontFileLister #define FontListerClass FreetypeFontFileLister
#elif defined(WITH_FONTCONFIG)
#include "font_file_lister_fontconfig.h"
#define FontListerClass FontConfigFontFileLister
#else #else
#include "font_file_lister.h" #include "font_file_lister.h"
#endif // WITH_FREETYPE2
#else
#include "font_file_lister_fontconfig.h"
/// DOCME
#define FontListerClass FontConfigFontFileLister
#endif #endif
#include "standard_paths.h" #include "standard_paths.h"
@ -236,5 +232,3 @@ void FontFileLister::LoadCache() {
catch (...) { catch (...) {
} }
} }

6
aegisub/src/font_file_lister.h
View file

@ -44,11 +44,7 @@
#include <wx/string.h> #include <wx/string.h>
#endif #endif
#ifdef WITH_FREETYPE2
////////////
// Typedefs
#if defined(__WINDOWS__) || defined(__APPLE__)
/// DOCME /// DOCME
typedef struct FT_LibraryRec_ *FT_Library; typedef struct FT_LibraryRec_ *FT_Library;
#endif #endif

2
aegisub/src/font_file_lister_fontconfig.cpp
View file

@ -36,7 +36,7 @@
#include "config.h" #include "config.h"
#if !defined(_WIN32) || defined(WITH_FONTCONFIG) #ifdef WITH_FONTCONFIG
#include "font_file_lister_fontconfig.h" #include "font_file_lister_fontconfig.h"
#include "charset_conv.h" #include "charset_conv.h"