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

Freetype/Fontconfig were pushed under two conditionals beacuse on Darwin we use

Browse source 
Freetype to list fonts (it uses native features).  When support for glibc iconv
was added the case broke and set $build_linux, the conditional for the
fontconfig font lister was $build_default which no longer got triggered.  Puts
the font listers under FONTLISTER_(FONTCONFIG|FREETYPE) conditional upon
$build_darwin being no/yes.

Originally committed to SVN as r2180.
This commit is contained in:
Amar Takhar 2008-04-13 17:44:54 +00:00
parent 806ba1eb5a
commit b012a3149c
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
aegisub/Makefile.am
View file

@ -122,11 +122,14 @@ UNIVCHARSET = charset_detect.cpp text_file_reader.cpp
endif endif
if BUILD_DARWIN if BUILD_DARWIN
FONT_LISTER = font_file_lister_freetype.cpp
BEVEL_BUTTON = macosx/bevelButton.cpp BEVEL_BUTTON = macosx/bevelButton.cpp
endif endif
if BUILD_DEFAULT if FONTLISTER_FREETYPE
FONT_LISTER = font_file_lister_freetype.cpp
endif
if FONTLISTER_FONTCONFIG
FONT_LISTER = font_file_lister_fontconfig.cpp FONT_LISTER = font_file_lister_fontconfig.cpp
endif endif

2
configure.in
View file

@ -64,6 +64,8 @@ esac
AM_CONDITIONAL([BUILD_DARWIN], [test "$build_darwin" = "yes"]) AM_CONDITIONAL([BUILD_DARWIN], [test "$build_darwin" = "yes"])
AM_CONDITIONAL([BUILD_DEFAULT], [test "$build_default" = "yes"]) AM_CONDITIONAL([BUILD_DEFAULT], [test "$build_default" = "yes"])
AM_CONDITIONAL([FONTLISTER_FONTCONFIG], [test "$build_darwin" != "yes"])
AM_CONDITIONAL([FONTLISTER_FREETYPE], [test "$build_darwin" = "yes"])
######################## ########################