diff options
| author | Charles Yates <charles.yates@pandora.be> | 2005-05-08 15:04:59 +0000 |
|---|---|---|
| committer | François Revol <revol@free.fr> | 2005-05-08 15:04:59 +0000 |
| commit | eb94aca926131cfbe5d818a679c6872a8bb97049 (patch) | |
| tree | ee53c3e1e75156ff13d57104402fd2133889f7f0 | |
| parent | 1c02a9732aa2e5ec0eaf83e65044704af05e8400 (diff) | |
| download | ffmpeg-eb94aca926131cfbe5d818a679c6872a8bb97049.tar.gz | |
support BUILDSUF patch by <charles dot yates at pandora dot be>
Originally committed as revision 4203 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 14 | ||||
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 |
4 files changed, 14 insertions, 6 deletions
@@ -91,7 +91,7 @@ endif OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O) SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) -FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec +FFLIBS = -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF) all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC) @@ -47,6 +47,7 @@ echo " --make=MAKE use specified make [$make]" echo " --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS [$CFLAGS]" echo " --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]" echo " --extra-libs=ELIBS add ELIBS [$ELIBS]" +echo " --build-suffix=SUFFIX suffix for application specific build []" echo " --cpu=CPU force cpu to CPU [$cpu]" echo " --tune=PROCESSOR tune code for a particular CPU (may fails or misperforms on other CPUs)" echo " --powerpc-perf-enable enable performance report on PPC (requires enabling PMC)" @@ -198,6 +199,7 @@ LIBSUF=".a" SLIBPREF="lib" SLIBSUF=".so" EXESUF="" +BUILDSUF="" amr_nb="no" amr_wb="no" amr_nb_fixed="no" @@ -403,6 +405,8 @@ for opt do ;; --extra-libs=*) extralibs=${opt#--extra-libs=} ;; + --build-suffix=*) BUILDSUF=${opt#--build-suffix=} + ;; --cpu=*) cpu=`echo $opt | cut -d '=' -f 2` ;; --tune=*) tune=`echo $opt | cut -d '=' -f 2` @@ -1092,6 +1096,9 @@ echo "Source path $source_path" echo "C compiler $cc" echo "make $make" echo "CPU $cpu ($tune)" +if test "$BUILDSUF" != ""; then +echo "Build suffix $BUILDSUF" +fi echo "Big Endian $bigendian" echo "inttypes.h $inttypes" echo "broken inttypes.h $emu_fast_int" @@ -1186,11 +1193,12 @@ echo "SHCFLAGS=$SHCFLAGS">>config.mak echo "LDFLAGS=$LDFLAGS" >> config.mak echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak echo "SHFLAGS=$SHFLAGS" >> config.mak +echo "BUILDSUF=$BUILDSUF" >> config.mak echo "LIBPREF=$LIBPREF" >> config.mak -echo "LIBSUF=$LIBSUF" >> config.mak +echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak echo "SLIBPREF=$SLIBPREF" >> config.mak -echo "SLIBSUF=$SLIBSUF" >> config.mak -echo "EXESUF=$EXESUF" >> config.mak +echo "SLIBSUF=\${BUILDSUF}$SLIBSUF" >> config.mak +echo "EXESUF=\${BUILDSUF}$EXESUF" >> config.mak echo "TARGET_OS=$TARGET_OS" >> config.mak if test "$cpu" = "x86" ; then echo "TARGET_ARCH_X86=yes" >> config.mak diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fe7daa444d..d438332b79 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -261,7 +261,7 @@ endif ifeq ($(CONFIG_PP),yes) ifeq ($(SHARED_PP),yes) -EXTRALIBS += -L$(VPATH)/libpostproc -lpostproc +EXTRALIBS += -L$(VPATH)/libpostproc -lpostproc$(BUILDSUF) else # LIBS += libpostproc/libpostproc.a ... should be fixed OBJS += libpostproc/postprocess.o diff --git a/libavformat/Makefile b/libavformat/Makefile index 3b804d2c05..83259b2fc0 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -77,7 +77,7 @@ LIB= $(LIBPREF)avformat$(LIBSUF) ifeq ($(BUILD_SHARED),yes) SLIB= $(SLIBPREF)avformat$(SLIBSUF) -AVCLIBS+=-lavcodec -L../libavcodec +AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec ifeq ($(CONFIG_MP3LAME),yes) AVCLIBS+=-lmp3lame endif |