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
This commit is contained in:
diego 2006-11-21 11:49:47 +00:00
parent 3f6df7b998
commit 6178e38e46
2 changed files with 17 additions and 17 deletions

View File

@ -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)

View File

@ -2,19 +2,21 @@
include ../config.mak
LIBNAME = libvo.a
LIBNAME2 = libosd.a
SRCS=aclib.c \
aspect.c \
SRCS=aspect.c \
geometry.c \
osd.c \
spuenc.c \
sub.c \
video_out.c \
vo_mpegpes.c \
vo_null.c \
vo_yuv4mpeg.c \
$(VO_SRCS) \
SRCS2 = aclib.c \
osd.c \
sub.c \
ifeq ($(CONFIG_LIBAVUTIL),yes)
LIBAV_INC += -I../libavutil
endif
@ -22,12 +24,13 @@ endif
OBJS_TEMP=$(basename $(SRCS))
OBJS=$(OBJS_TEMP:%=%.o)
ifeq ($(BITMAP_FONT),yes)
SRCS += font_load.c
endif
OBJS2=$(SRCS2:.c=.o)
ifeq ($(BITMAP_FONT),yes)
SRCS2 += font_load.c
endif
ifeq ($(FREETYPE),yes)
SRCS += font_load_ft.c
SRCS2 += font_load_ft.c
endif
ifeq ($(VIDIX),yes)
@ -53,11 +56,15 @@ CFLAGS = $(INCLUDE) $(OPTFLAGS)
.m.o:
$(CC) -c $(CFLAGS) -o $@ $<
all: $(LIBNAME) $(LIBNAME2)
$(LIBNAME): $(OBJS)
$(AR) r $(LIBNAME) $(OBJS)
$(RANLIB) $(LIBNAME)
all: $(LIBNAME)
$(LIBNAME2): $(OBJS2)
$(AR) r $(LIBNAME2) $(OBJS2)
$(RANLIB) $(LIBNAME2)
clean:
rm -f *.o *.a *~