diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-14 21:45:45 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-02-14 21:45:45 +0000 |
| commit | dd16f0a075ce56ccb67d0d7397f5335d9542d234 (patch) | |
| tree | da0c8eb1f8f63e8a09eb60ebeaa2ffe949bb9552 /Makefile | |
| parent | 36f99211026e8f9cd5c69f70853df7410e2a256a (diff) | |
| download | mpv-dd16f0a075ce56ccb67d0d7397f5335d9542d234.tar.bz2 mpv-dd16f0a075ce56ccb67d0d7397f5335d9542d234.tar.xz | |
moving postprocess code to libavcodec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9427 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 1 insertions, 15 deletions
@@ -36,7 +36,7 @@ OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(NAS_LIB) $(SGIAUDIO_LIB) CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) -COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a $(PP_LIB) postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB) +COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB) CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) # -Wall @@ -81,11 +81,6 @@ ALL_PRG += $(PRG_FIBMAP) endif COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a osdep/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a -ifeq (($SHARED_PP),yes) -COMMON_DEPS += postproc/libpostproc.so -else -COMMON_DEPS += postproc/libpostproc.a -endif ifeq ($(VIDIX),yes) COMMON_DEPS += libdha/libdha.so vidix/libvidix.a @@ -176,12 +171,6 @@ osdep/libosdep.a: postproc/libswscale.a: $(MAKE) -C postproc -postproc/libpostproc.a: - $(MAKE) -C postproc - -postproc/libpostproc.so: - $(MAKE) -C postproc - input/libinput.a: $(MAKE) -C input @@ -251,9 +240,6 @@ install: $(ALL_PRG) ifeq ($(VIDIX),yes) $(DO_MAKE) endif -ifeq ($(SHARED_PP),yes) - $(MAKE) install -C postproc -endif if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG) ifeq ($(GUI),yes) |