Commit f3f09df3 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Freetype: rename HAVE_STYLES

parent 9e3a4af5
...@@ -65,18 +65,18 @@ ...@@ -65,18 +65,18 @@
#ifdef __APPLE__ #ifdef __APPLE__
# include <TargetConditionals.h> # include <TargetConditionals.h>
# undef HAVE_FONTCONFIG # undef HAVE_FONTCONFIG
# define HAVE_STYLES # define HAVE_GET_FONT_BY_FAMILY_NAME
#endif #endif
/* Win32 */ /* Win32 */
#ifdef _WIN32 #ifdef _WIN32
# undef HAVE_FONTCONFIG # undef HAVE_FONTCONFIG
# define HAVE_STYLES # define HAVE_GET_FONT_BY_FAMILY_NAME
#endif #endif
/* FontConfig */ /* FontConfig */
#ifdef HAVE_FONTCONFIG #ifdef HAVE_FONTCONFIG
# define HAVE_STYLES # define HAVE_GET_FONT_BY_FAMILY_NAME
#endif #endif
#include <assert.h> #include <assert.h>
...@@ -159,7 +159,7 @@ vlc_module_begin () ...@@ -159,7 +159,7 @@ vlc_module_begin ()
set_category( CAT_VIDEO ) set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_SUBPIC ) set_subcategory( SUBCAT_VIDEO_SUBPIC )
#ifdef HAVE_STYLES #ifdef HAVE_GET_FONT_BY_FAMILY_NAME
add_font( "freetype-font", DEFAULT_FAMILY, FONT_TEXT, FAMILY_LONGTEXT, false ) add_font( "freetype-font", DEFAULT_FAMILY, FONT_TEXT, FAMILY_LONGTEXT, false )
add_font( "freetype-monofont", DEFAULT_MONOSPACE_FAMILY, MONOSPACE_FONT_TEXT, FAMILY_LONGTEXT, false ) add_font( "freetype-monofont", DEFAULT_MONOSPACE_FAMILY, MONOSPACE_FONT_TEXT, FAMILY_LONGTEXT, false )
#else #else
...@@ -1919,7 +1919,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -1919,7 +1919,7 @@ static int Create( vlc_object_t *p_this )
if( !psz_fontname || !*psz_fontname ) if( !psz_fontname || !*psz_fontname )
{ {
free( psz_fontname ); free( psz_fontname );
#ifdef HAVE_STYLES #ifdef HAVE_GET_FONT_BY_FAMILY_NAME
psz_fontname = strdup( DEFAULT_FAMILY ); psz_fontname = strdup( DEFAULT_FAMILY );
#else #else
psz_fontname = File_Select( DEFAULT_FONT_FILE ); psz_fontname = File_Select( DEFAULT_FONT_FILE );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment