mirror of
https://github.com/mpv-player/mpv
synced 2024-08-24 07:21:49 +02:00
Deliver dependency handling from redundancy.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21105 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
6ea42bcf02
commit
71c7b6353e
28
Makefile
28
Makefile
@ -85,20 +85,11 @@ LIBS_MENCODER = libmpcodecs/libmpencoders.a \
|
||||
$(EXTRA_LIB_MENCODER) \
|
||||
$(COMMON_LIBS) \
|
||||
|
||||
COMMON_DEPS = $(W32_DEP) \
|
||||
$(AV_DEP) \
|
||||
libmpdemux/libmpdemux.a \
|
||||
stream/stream.a \
|
||||
libmpcodecs/libmpcodecs.a \
|
||||
osdep/libosdep.a \
|
||||
libswscale/libswscale.a \
|
||||
libaf/libaf.a \
|
||||
|
||||
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
|
||||
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
|
||||
|
||||
MPLAYER_DEPS = $(OBJS_MPLAYER) $(COMMON_DEPS)
|
||||
MENCODER_DEPS = $(OBJS_MENCODER) $(COMMON_DEPS) libmpcodecs/libmpencoders.a
|
||||
MPLAYER_DEPS = $(OBJS_MPLAYER) $(LIBS_MPLAYER) $(COMMON_LIBS)
|
||||
MENCODER_DEPS = $(OBJS_MENCODER) $(LIBS_MENCODER) $(COMMON_LIBS)
|
||||
|
||||
PARTS = libmpdemux \
|
||||
stream \
|
||||
@ -118,47 +109,38 @@ ifeq ($(WIN32DLL),yes)
|
||||
PARTS += loader loader/dshow loader/dmo
|
||||
endif
|
||||
ifeq ($(MP3LIB),yes)
|
||||
COMMON_DEPS += mp3lib/libMP3.a
|
||||
COMMON_LIBS += mp3lib/libMP3.a
|
||||
PARTS += mp3lib
|
||||
endif
|
||||
ifeq ($(LIBA52),yes)
|
||||
COMMON_DEPS += liba52/liba52.a
|
||||
COMMON_LIBS += liba52/liba52.a
|
||||
PARTS += liba52
|
||||
endif
|
||||
ifeq ($(LIBMPEG2),yes)
|
||||
COMMON_DEPS += libmpeg2/libmpeg2.a
|
||||
COMMON_LIBS += libmpeg2/libmpeg2.a
|
||||
PARTS += libmpeg2
|
||||
endif
|
||||
ifeq ($(FAAD_INTERNAL),yes)
|
||||
COMMON_DEPS += libfaad2/libfaad2.a
|
||||
COMMON_LIBS += libfaad2/libfaad2.a
|
||||
PARTS += libfaad2
|
||||
endif
|
||||
ifeq ($(TREMOR_INTERNAL),yes)
|
||||
COMMON_DEPS += tremor/libvorbisidec.a
|
||||
COMMON_LIBS += tremor/libvorbisidec.a
|
||||
PARTS += tremor
|
||||
endif
|
||||
ifeq ($(VIDIX),yes)
|
||||
MPLAYER_DEPS += libdha/libdha.so vidix/libvidix.a
|
||||
VO_LIBS += vidix/libvidix.a
|
||||
VO_LIBS += libdha/libdha.so vidix/libvidix.a
|
||||
PARTS += libdha vidix
|
||||
endif
|
||||
ifeq ($(DVDREAD_INTERNAL),yes)
|
||||
COMMON_DEPS += dvdread/libdvdread.a
|
||||
COMMON_LIBS += dvdread/libdvdread.a
|
||||
PARTS += dvdread
|
||||
endif
|
||||
ifeq ($(DVDCSS_INTERNAL),yes)
|
||||
COMMON_DEPS += libdvdcss/libdvdcss.a
|
||||
COMMON_LIBS += libdvdcss/libdvdcss.a
|
||||
PARTS += libdvdcss
|
||||
endif
|
||||
ifeq ($(CONFIG_ASS),yes)
|
||||
COMMON_DEPS += libass/libass.a
|
||||
COMMON_LIBS += libass/libass.a
|
||||
PARTS += libass
|
||||
endif
|
||||
@ -169,12 +151,10 @@ SRCS_MENCODER += libvo/font_load_ft.c
|
||||
COMMON_LIBS += $(FREETYPE_LIB)
|
||||
endif
|
||||
ifeq ($(GUI),yes)
|
||||
MPLAYER_DEPS += Gui/libgui.a
|
||||
LIBS_MPLAYER += Gui/libgui.a $(GTK_LIBS)
|
||||
PARTS += Gui
|
||||
endif
|
||||
ifeq ($(LIBMENU),yes)
|
||||
MPLAYER_DEPS += libmenu/libmenu.a
|
||||
LIBS_MPLAYER += libmenu/libmenu.a
|
||||
PARTS += libmenu
|
||||
endif
|
||||
@ -189,8 +169,6 @@ endif
|
||||
|
||||
.SUFFIXES: .cc .c .o
|
||||
|
||||
#.PHONY: $(COMMON_DEPS)
|
||||
|
||||
all: $(ALL_PRG)
|
||||
|
||||
.c.o:
|
||||
|
7
configure
vendored
7
configure
vendored
@ -5922,7 +5922,6 @@ if test "$_win32" = yes ; then
|
||||
_def_win32='#define USE_WIN32DLL 1'
|
||||
_res_comment="using $_win32codecsdir"
|
||||
_ld_win32='loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a'
|
||||
_dep_win32='loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a'
|
||||
openbsd && x86 && _ld_win32="$_ld_win32 -li386"
|
||||
if not win32 ; then
|
||||
_def_win32_loader='#define WIN32_LOADER 1'
|
||||
@ -6208,11 +6207,9 @@ if test "$_libavcodec" = yes ; then
|
||||
_def_libavcodec='#define USE_LIBAVCODEC 1'
|
||||
_def_lavc_dsputil='#define USE_LIBAVCODEC_DSPUTIL'
|
||||
_ld_libavcodec='libavcodec/libavcodec.a'
|
||||
_dep_libavcodec='libavcodec/libavcodec.a'
|
||||
_codecmodules="libavcodec $_codecmodules"
|
||||
if test "$_libavutil" = yes; then
|
||||
_ld_libavutil='libavutil/libavutil.a'
|
||||
_dep_libavutil='libavutil/libavutil.a'
|
||||
fi
|
||||
elif test "$_libavcodec_so" = yes ; then
|
||||
_def_libavcodec='#define USE_LIBAVCODEC 1'
|
||||
@ -6229,7 +6226,6 @@ _def_libavformat_win32='#undef CONFIG_WIN32'
|
||||
if test "$_libavformat" = yes ; then
|
||||
_def_libavformat='#define USE_LIBAVFORMAT 1'
|
||||
_ld_libavformat='libavformat/libavformat.a'
|
||||
_dep_libavformat='libavformat/libavformat.a'
|
||||
if win32 ; then
|
||||
_def_libavformat_win32='#define CONFIG_WIN32 1'
|
||||
fi
|
||||
@ -6248,7 +6244,6 @@ _def_libpostproc_so='#undef USE_LIBPOSTPROC_SO'
|
||||
if test "$_libpostproc" = yes ; then
|
||||
_def_libpostproc='#define USE_LIBPOSTPROC 1'
|
||||
_ld_libpostproc='libpostproc/libpostproc.a'
|
||||
_dep_libpostproc='libpostproc/libpostproc.a'
|
||||
else
|
||||
if test "$_libpostproc_so" = yes ; then
|
||||
_def_libpostproc_so='#define USE_LIBPOSTPROC_SO 1'
|
||||
@ -7452,11 +7447,9 @@ DVDREAD_INTERNAL = $_dvdread_internal
|
||||
DVDCSS_INTERNAL = $_libdvdcss_internal
|
||||
DVDNAV = $_dvdnav
|
||||
WIN32DLL = $_win32
|
||||
W32_DEP = $_dep_win32
|
||||
QTX_CODECS = $_qtx
|
||||
REAL_CODECS = $_real
|
||||
XANIM_CODECS = $_xanim
|
||||
AV_DEP = $_dep_libavformat $_dep_libavcodec $_dep_libavutil $_dep_libpostproc
|
||||
AV_LIB = $_ld_libavformat $_ld_libavcodec $_ld_libavutil $_ld_libpostproc
|
||||
CONFIG_LIBAVUTIL = $_libavutil
|
||||
CONFIG_LIBAVUTIL_SO = $_libavutil_so
|
||||
|
Loading…
Reference in New Issue
Block a user