summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-09 18:33:26 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-09 18:33:26 +0000
commitb2f9633eab887c15e04505ec9eb118c5c7a5b489 (patch)
tree90d29f6b45d0643cbf6bccaaecffb761c8c872aa
parent2f4381fffda7ffe7cd1bce14d04422a2b6347b0c (diff)
downloadmpv-b2f9633eab887c15e04505ec9eb118c5c7a5b489.tar.bz2
mpv-b2f9633eab887c15e04505ec9eb118c5c7a5b489.tar.xz
10l: libass compilation should be conditional.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26379 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile19
1 files changed, 10 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 21fcb34148..3b1eb7ff11 100644
--- a/Makefile
+++ b/Makefile
@@ -59,21 +59,22 @@ SRCS_COMMON = asxparser.c \
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