github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-10-18 10:25:02 +02:00
Code Releases Activity

cosmetics: Remove CONFIG_ prefix from FFmpeg library Makefile variables.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23110 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2007-04-25 08:35:35 +00:00
parent 78012f3414
commit 5a8c8aadef
6 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -8,7 +8,7 @@ include config.mak
CFLAGS = -I. -I./libavutil $(OPTFLAGS)
CFLAGS-$(CONFIG_LIBAVCODEC) += -I./libavcodec
CFLAGS-$(LIBAVCODEC) += -I./libavcodec
CFLAGS += $(CFLAGS-yes)
COMMON_LDFLAGS += $(EXTRA_LIB)\
@ -60,10 +60,10 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
libswscale/libswscale.a \
libvo/libosd.a \
COMMON_LIBS-$(CONFIG_LIBAVFORMAT) += libavformat/libavformat.a
COMMON_LIBS-$(CONFIG_LIBAVCODEC) += libavcodec/libavcodec.a
COMMON_LIBS-$(CONFIG_LIBAVUTIL) += libavutil/libavutil.a
COMMON_LIBS-$(CONFIG_LIBPOSTPROC) += libpostproc/libpostproc.a
COMMON_LIBS-$(LIBAVFORMAT) += libavformat/libavformat.a
COMMON_LIBS-$(LIBAVCODEC) += libavcodec/libavcodec.a
COMMON_LIBS-$(LIBAVUTIL) += libavutil/libavutil.a
COMMON_LIBS-$(LIBPOSTPROC) += libpostproc/libpostproc.a
COMMON_LIBS-$(WIN32DLL) += loader/libloader.a
COMMON_LIBS-$(MP3LIB) += mp3lib/libmp3.a
COMMON_LIBS-$(LIBA52) += liba52/liba52.a

16
configure vendored
View File

@ -7750,14 +7750,14 @@ WIN32DLL = $_win32dll
QTX_CODECS = $_qtx
REAL_CODECS = $_real
XANIM_CODECS = $_xanim
CONFIG_LIBAVUTIL = $_libavutil
CONFIG_LIBAVUTIL_SO = $_libavutil_so
CONFIG_LIBAVCODEC = $_libavcodec
CONFIG_LIBAVCODEC_SO = $_libavcodec_so
CONFIG_LIBAVFORMAT = $_libavformat
CONFIG_LIBAVFORMAT_SO = $_libavformat_so
CONFIG_LIBPOSTPROC = $_libpostproc
CONFIG_LIBPOSTPROC_SO = $_libpostproc_so
LIBAVUTIL = $_libavutil
LIBAVUTIL_SO = $_libavutil_so
LIBAVCODEC = $_libavcodec
LIBAVCODEC_SO = $_libavcodec_so
LIBAVFORMAT = $_libavformat
LIBAVFORMAT_SO = $_libavformat_so
LIBPOSTPROC = $_libpostproc
LIBPOSTPROC_SO = $_libpostproc_so
ZORAN = $_zr
LIBLZO = $_liblzo
LIBDV = $_libdv

4
libaf/Makefile
View File

@ -28,8 +28,8 @@ SRCS_COMMON = af.c \
window.c \
$(AF_SRCS) \
SRCS_COMMON-$(CONFIG_LIBAVCODEC) += af_lavcresample.c
SRCS_COMMON-$(CONFIG_LIBAVCODEC_SO) += af_lavcresample.c
SRCS_COMMON-$(HAVE_SYS_MMAN_H) += af_export.c
SRCS_COMMON-$(LIBAVCODEC) += af_lavcresample.c
SRCS_COMMON-$(LIBAVCODEC_SO) += af_lavcresample.c
include ../mpcommon.mak

14
libmpcodecs/Makefile
View File

@ -95,24 +95,24 @@ SRCS_COMMON = native/nuppelvideo.c \
SRCS_COMMON-$(CONFIG_ASS) += vf_ass.c
# These filters use private headers and do not work with shared libavcodec.
SRCS_COMMON-$(CONFIG_LIBAVCODEC) += vf_fspp.c \
SRCS_COMMON-$(LIBAVCODEC) += vf_fspp.c \
vf_geq.c \
vf_mcdeint.c \
vf_qp.c \
vf_spp.c \
vf_uspp.c \
SRCS_COMMON-$(CONFIG_LIBAVCODEC) += ad_ffmpeg.c vd_ffmpeg.c vf_lavc.c vf_lavcdeint.c
SRCS_COMMON-$(CONFIG_LIBAVCODEC_SO) += ad_ffmpeg.c vd_ffmpeg.c vf_lavc.c vf_lavcdeint.c
SRCS_COMMON-$(CONFIG_LIBPOSTPROC) += vf_pp.c
SRCS_COMMON-$(CONFIG_LIBPOSTPROC_SO) += vf_pp.c
SRCS_COMMON-$(FAAD) += ad_faad.c
SRCS_COMMON-$(HAVE_POSIX_SELECT) += vf_bmovl.c
SRCS_COMMON-$(JPEG) += vd_ijpg.c
SRCS_COMMON-$(LIBA52) += ad_liba52.c
SRCS_COMMON-$(LIBAVCODEC) += ad_ffmpeg.c vd_ffmpeg.c vf_lavc.c vf_lavcdeint.c
SRCS_COMMON-$(LIBAVCODEC_SO) += ad_ffmpeg.c vd_ffmpeg.c vf_lavc.c vf_lavcdeint.c
SRCS_COMMON-$(LIBDV) += ad_libdv.c vd_libdv.c
SRCS_COMMON-$(LIBMAD) += ad_libmad.c
SRCS_COMMON-$(LIBMPEG2) += vd_libmpeg2.c
SRCS_COMMON-$(LIBPOSTPROC) += vf_pp.c
SRCS_COMMON-$(LIBPOSTPROC_SO) += vf_pp.c
SRCS_COMMON-$(LIBTHEORA) += vd_theora.c
SRCS_COMMON-$(LIBVORBIS) += ad_libvorbis.c
SRCS_COMMON-$(MP3LIB) += ad_mp3lib.c
@ -133,8 +133,8 @@ SRCS_MENCODER = ae.c \
ve.c \
ve_raw.c \
SRCS_MENCODER-$(CONFIG_LIBAVCODEC) += ae_lavc.c ve_lavc.c
SRCS_MENCODER-$(CONFIG_LIBAVCODEC_SO) += ae_lavc.c ve_lavc.c
SRCS_MENCODER-$(LIBAVCODEC) += ae_lavc.c ve_lavc.c
SRCS_MENCODER-$(LIBAVCODEC_SO) += ae_lavc.c ve_lavc.c
SRCS_MENCODER-$(LIBDV) += ve_libdv.c
SRCS_MENCODER-$(LIBLZO) += ve_nuv.c
SRCS_MENCODER-$(QTX_CODECS) += ve_qtvideo.c

8
libmpdemux/Makefile
View File

@ -45,9 +45,9 @@ SRCS_COMMON = asfheader.c \
yuv4mpeg.c \
yuv4mpeg_ratio.c \
SRCS_COMMON-$(CONFIG_LIBAVFORMAT) += demux_lavf.c
SRCS_COMMON-$(CONFIG_LIBAVFORMAT_SO) += demux_lavf.c
SRCS_COMMON-$(GIF) += demux_gif.c
SRCS_COMMON-$(LIBAVFORMAT) += demux_lavf.c
SRCS_COMMON-$(LIBAVFORMAT_SO) += demux_lavf.c
SRCS_COMMON-$(LIBDV) += demux_rawdv.c
SRCS_COMMON-$(LIBNUT) += demux_nut.c
SRCS_COMMON-$(LIBVORBIS) += demux_ogg.c
@ -62,7 +62,7 @@ SRCS_MENCODER = muxer.c \
muxer_rawaudio.c \
muxer_rawvideo.c \
SRCS_MENCODER-$(CONFIG_LIBAVFORMAT) += muxer_lavf.c
SRCS_MENCODER-$(CONFIG_LIBAVFORMAT_SO) += muxer_lavf.c
SRCS_MENCODER-$(LIBAVFORMAT) += muxer_lavf.c
SRCS_MENCODER-$(LIBAVFORMAT_SO) += muxer_lavf.c
include ../mpcommon.mak

4
mpcommon.mak
View File

@ -6,8 +6,8 @@ OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)) )
OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER)) )
OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER)) )
CFLAGS-$(CONFIG_LIBAVCODEC) += -I../libavcodec
CFLAGS-$(CONFIG_LIBAVFORMAT) += -I../libavformat
CFLAGS-$(LIBAVCODEC) += -I../libavcodec
CFLAGS-$(LIBAVFORMAT) += -I../libavformat
CFLAGS += $(CFLAGS-yes) $(OPTFLAGS)
LIBS-$(MPLAYER) += $(LIBNAME_MPLAYER)