virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

Build process: libpostproc patch by (Franti?ek Dvo?ák <valtri at users dot sourceforge dot net>)

Browse Source 
Originally committed as revision 3559 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Frantisek Dvorak 2004-10-05 17:43:10 +00:00 committed by Michael Niedermayer
parent 0bc42caddf
commit 91378af4b2
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/Makefile
View File

@ -102,7 +102,7 @@ endif
ifeq ($(CONFIG_PP),yes) ifeq ($(CONFIG_PP),yes)
ifeq ($(SHARED_PP),yes) ifeq ($(SHARED_PP),yes)
EXTRALIBS += -lpostproc EXTRALIBS += -L$(VPATH)/libpostproc -lpostproc
else else
# LIBS += libpostproc/libpostproc.a ... should be fixed # LIBS += libpostproc/libpostproc.a ... should be fixed
OBJS += libpostproc/postprocess.o OBJS += libpostproc/postprocess.o
@ -207,6 +207,9 @@ $(LIB): $(OBJS) $(AMRLIBS)
$(RANLIB) $@ $(RANLIB) $@
$(SLIB): $(OBJS) $(SLIB): $(OBJS)
ifeq ($(CONFIG_PP),yes)
$(MAKE) -C $(VPATH)/libpostproc
endif
ifeq ($(CONFIG_WIN32),yes) ifeq ($(CONFIG_WIN32),yes)
$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
-lib /machine:i386 /def:$(@:.dll=.def) -lib /machine:i386 /def:$(@:.dll=.def)
@ -287,6 +290,9 @@ else
ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
ldconfig || true ldconfig || true
endif endif
ifeq ($(CONFIG_PP),yes)
$(MAKE) -C $(VPATH)/libpostproc $@
endif
else else
install: install:
endif endif

10
libavcodec/libpostproc/Makefile
View File

@ -2,10 +2,10 @@
include ../../config.mak include ../../config.mak
ifeq ($(SHARED_PP),yes) ifeq ($(SHARED_PP),yes)
SPPLIB = libpostproc.so SPPLIB = $(SLIBPREF)postproc$(SLIBSUF)
SPPVERSION = 0.0.1 SPPVERSION = 0.0.1
endif endif
PPLIB = libpostproc.a PPLIB = $(LIBPREF)postproc$(LIBSUF)
PPOBJS=postprocess.o PPOBJS=postprocess.o
SPPOBJS=postprocess_pic.o SPPOBJS=postprocess_pic.o
@ -23,7 +23,7 @@ CFLAGS = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
all: $(SWSLIB) $(PPLIB) $(SPPLIB) all: $(SWSLIB) $(PPLIB) $(SPPLIB)
clean: clean:
rm -f *.o *.a *~ *.so rm -f *.o *.a *~ *.so $(PPLIB) $(SPPLIB)
distclean: distclean:
rm -f Makefile.bak *.o *.a *~ *.so .depend rm -f Makefile.bak *.o *.a *~ *.so .depend
@ -49,10 +49,14 @@ $(PPLIB): $(PPOBJS)
install: all install: all
ifeq ($(SHARED_PP),yes) ifeq ($(SHARED_PP),yes)
ifeq ($(CONFIG_WIN32),yes)
install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"
else
install -d $(prefix)/lib install -d $(prefix)/lib
install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION) install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)
ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB) ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
ldconfig || true ldconfig || true
endif
endif endif
mkdir -p $(prefix)/include/postproc mkdir -p $(prefix)/include/postproc
install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h