comparison Makefile @ 21111:22f13d04b180

Move FFmpeg library dependencies into the Makefile just like everything else.
author diego
date Tue, 21 Nov 2006 12:49:46 +0000
parents 76f8d2c50d4c
children 2b762f7a3bd8
comparison
equal deleted inserted replaced
21110:5a7bea3bb65c 21111:22f13d04b180
61 libmpdemux/libmpdemux.a \ 61 libmpdemux/libmpdemux.a \
62 stream/stream.a \ 62 stream/stream.a \
63 libswscale/libswscale.a \ 63 libswscale/libswscale.a \
64 libvo/libosd.a \ 64 libvo/libosd.a \
65 osdep/libosdep.a \ 65 osdep/libosdep.a \
66 $(AV_LIB) \
67 $(EXTRA_LIB)\
68 $(EXTRALIBS) \
69 66
70 LIBS_MPLAYER = libvo/libvo.a \ 67 LIBS_MPLAYER = libvo/libvo.a \
71 libao2/libao2.a \ 68 libao2/libao2.a \
72 input/libinput.a \ 69 input/libinput.a \
73 $(EXTRALIBS_MPLAYER) \ 70 $(EXTRALIBS_MPLAYER) \
95 osdep \ 92 osdep \
96 input \ 93 input \
97 libvo \ 94 libvo \
98 libaf \ 95 libaf \
99 96
97 ifeq ($(CONFIG_LIBAVFORMAT),yes)
98 COMMON_LIBS += libavformat/libavformat.a
99 PARTS += libavformat
100 endif
101 ifeq ($(CONFIG_LIBAVCODEC),yes)
102 COMMON_LIBS += libavcodec/libavcodec.a
103 PARTS += libavcodec
104 endif
105 ifeq ($(CONFIG_LIBAVUTIL),yes)
106 COMMON_LIBS += libavutil/libavutil.a
107 PARTS += libavutil
108 endif
109 ifeq ($(CONFIG_LIBPOSTPROC),yes)
110 COMMON_LIBS += libpostproc/libpostproc.a
111 PARTS += libpostproc
112 endif
100 ifeq ($(WIN32DLL),yes) 113 ifeq ($(WIN32DLL),yes)
101 COMMON_LIBS += loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a 114 COMMON_LIBS += loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a
102 PARTS += loader loader/dshow loader/dmo 115 PARTS += loader loader/dshow loader/dmo
103 endif 116 endif
104 ifeq ($(MP3LIB),yes) 117 ifeq ($(MP3LIB),yes)
151 PARTS += libmenu 164 PARTS += libmenu
152 endif 165 endif
153 ifeq ($(TARGET_WIN32),yes) 166 ifeq ($(TARGET_WIN32),yes)
154 OBJS_MPLAYER += osdep/mplayer-rc.o 167 OBJS_MPLAYER += osdep/mplayer-rc.o
155 endif 168 endif
169
170 COMMON_LIBS += $(EXTRA_LIB)\
171 $(EXTRALIBS) \
156 172
157 ifeq ($(MPLAYER),yes) 173 ifeq ($(MPLAYER),yes)
158 ALL_PRG = mplayer$(EXESUF) 174 ALL_PRG = mplayer$(EXESUF)
159 endif 175 endif
160 ifeq ($(MENCODER),yes) 176 ifeq ($(MENCODER),yes)