diff Makefile @ 21107:790256469dd7

Split libvo.a into two libs so that libosd.a can be used by MEncoder.
author diego
date Tue, 21 Nov 2006 11:49:47 +0000
parents b281f4a82031
children 76f8d2c50d4c
line wrap: on
line diff
--- a/Makefile	Tue Nov 21 11:35:41 2006 +0000
+++ b/Makefile	Tue Nov 21 11:49:47 2006 +0000
@@ -53,21 +53,15 @@
 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 @@
 # 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)