# HG changeset patch # User diego # Date 1207766006 0 # Node ID 1e6b8666f96f5138ab70bc1e8567d7ad5ed8bd9e # Parent 55f8d56ed7fe3768ea5813301821e33fd91378cd 10l: libass compilation should be conditional. diff -r 55f8d56ed7fe -r 1e6b8666f96f Makefile --- a/Makefile Wed Apr 09 18:26:44 2008 +0000 +++ b/Makefile Wed Apr 09 18:33:26 2008 +0000 @@ -59,21 +59,22 @@ libaf/format.c \ libaf/reorder_ch.c \ libaf/window.c \ - libass/ass.c \ - libass/ass_bitmap.c \ - libass/ass_cache.c \ - libass/ass_font.c \ - libass/ass_fontconfig.c \ - libass/ass_library.c \ - libass/ass_mp.c \ - libass/ass_render.c \ - libass/ass_utils.c \ osdep/$(GETCH) \ osdep/$(TIMER) \ SRCS_COMMON-$(HAVE_SYS_MMAN_H) += osdep/mmap_anon.c SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c +SRCS_COMMON-$(LIBASS) += libass/ass.c \ + libass/ass_bitmap.c \ + libass/ass_cache.c \ + libass/ass_font.c \ + libass/ass_fontconfig.c \ + libass/ass_library.c \ + libass/ass_mp.c \ + libass/ass_render.c \ + libass/ass_utils.c \ + SRCS_COMMON-$(LIBAVCODEC) += libaf/af_lavcresample.c SRCS_COMMON-$(LIBAVCODEC_A) += libaf/af_lavcac3enc.c SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c