summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-21 11:49:47 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-21 11:49:47 +0000
commit6178e38e46480f00e89521036b8011260de01699 (patch)
treed5650dbcb4debdd89e968256559aac0b64c8586a /Makefile
parent3f6df7b9984662a3c603f007fc9d6f9c781c939a (diff)
downloadmpv-6178e38e46480f00e89521036b8011260de01699.tar.bz2
mpv-6178e38e46480f00e89521036b8011260de01699.tar.xz
Split libvo.a into two libs so that libosd.a can be used by MEncoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21123 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 1 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index a5146d0d08..e7f3dd6d26 100644
--- a/Makefile
+++ b/Makefile
@@ -53,21 +53,15 @@ SRCS_MPLAYER = mplayer.c \
SRCS_MENCODER = mencoder.c \
mp_msg-mencoder.c \
$(SRCS_COMMON) \
- libvo/aclib.c \
- libvo/osd.c \
- libvo/sub.c \
parser-mecmd.c \
xvid_vbr.c \
-ifeq ($(BITMAP_FONT),yes)
-SRCS_MENCODER += libvo/font_load.c
-endif
-
COMMON_LIBS = libmpcodecs/libmpcodecs.a \
libaf/libaf.a \
libmpdemux/libmpdemux.a \
stream/stream.a \
libswscale/libswscale.a \
+ libvo/libosd.a \
osdep/libosdep.a \
$(AV_LIB) \
$(EXTRA_LIB)\
@@ -147,7 +141,6 @@ endif
# FontConfig and FreeType need to come after ASS to avoid link failures on MinGW
COMMON_LIBS += $(FONTCONFIG_LIB)
ifeq ($(FREETYPE),yes)
-SRCS_MENCODER += libvo/font_load_ft.c
COMMON_LIBS += $(FREETYPE_LIB)
endif
ifeq ($(GUI),yes)