diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-09-29 18:36:52 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-09-29 18:36:52 +0000 |
| commit | f658493daeb1b2629b7c561d1f432612219c72d0 (patch) | |
| tree | 7aa85836326e3dc6f4699bb3aa13793ec4f99181 /src/xine-engine/Makefile.am | |
| parent | d207e3f60b5e10a5950d884d84de5cb49cbf2f32 (diff) | |
| download | xine-lib-f658493daeb1b2629b7c561d1f432612219c72d0.tar.gz xine-lib-f658493daeb1b2629b7c561d1f432612219c72d0.tar.bz2 | |
Add an optional dependency over fontconfig, so that if present it is used to identify which font to load for OSD and subtitles. This allows to use truetype fonts by specifying their friendly name and just that. Also prefer FreeType2 loaded fonts to bitmap fonts.
CVS patchset: 8321
CVS date: 2006/09/29 18:36:52
Diffstat (limited to 'src/xine-engine/Makefile.am')
| -rw-r--r-- | src/xine-engine/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 0e702e2d0..bd3c70897 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -1,7 +1,7 @@ include $(top_srcdir)/misc/Makefile.common include $(top_srcdir)/lib/Makefile.common -AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) $(VISIBILITY_FLAG) +AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(VISIBILITY_FLAG) AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE LIBTOOL = $(SHELL) $(top_builddir)/libtool @@ -27,7 +27,7 @@ EXTRA_DIST = lrb.c lrb.h accel_xvmc.h libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) \ $(pthread_dep) $(LIBXINEPOSIX) libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL) $(ZLIB_LIBS) \ - -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) \ + -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) $(FONTCONFIG_LIBS) \ $(LIBXINEPOSIX) $(RT_LIBS) libxine_la_LDFLAGS = \ |