Commit 2ec8662e authored by mmu_man's avatar mmu_man

support BUILDSUF patch by <charles dot yates at pandora dot be>


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4203 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 271cb370
...@@ -91,7 +91,7 @@ endif ...@@ -91,7 +91,7 @@ endif
OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O) OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O)
SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) 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) all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
......
...@@ -47,6 +47,7 @@ echo " --make=MAKE use specified make [$make]" ...@@ -47,6 +47,7 @@ echo " --make=MAKE use specified make [$make]"
echo " --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS [$CFLAGS]" echo " --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS [$CFLAGS]"
echo " --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]" echo " --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]"
echo " --extra-libs=ELIBS add ELIBS [$ELIBS]" 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 " --cpu=CPU force cpu to CPU [$cpu]"
echo " --tune=PROCESSOR tune code for a particular CPU (may fails or misperforms on other CPUs)" 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)" echo " --powerpc-perf-enable enable performance report on PPC (requires enabling PMC)"
...@@ -198,6 +199,7 @@ LIBSUF=".a" ...@@ -198,6 +199,7 @@ LIBSUF=".a"
SLIBPREF="lib" SLIBPREF="lib"
SLIBSUF=".so" SLIBSUF=".so"
EXESUF="" EXESUF=""
BUILDSUF=""
amr_nb="no" amr_nb="no"
amr_wb="no" amr_wb="no"
amr_nb_fixed="no" amr_nb_fixed="no"
...@@ -403,6 +405,8 @@ for opt do ...@@ -403,6 +405,8 @@ for opt do
;; ;;
--extra-libs=*) extralibs=${opt#--extra-libs=} --extra-libs=*) extralibs=${opt#--extra-libs=}
;; ;;
--build-suffix=*) BUILDSUF=${opt#--build-suffix=}
;;
--cpu=*) cpu=`echo $opt | cut -d '=' -f 2` --cpu=*) cpu=`echo $opt | cut -d '=' -f 2`
;; ;;
--tune=*) tune=`echo $opt | cut -d '=' -f 2` --tune=*) tune=`echo $opt | cut -d '=' -f 2`
...@@ -1092,6 +1096,9 @@ echo "Source path $source_path" ...@@ -1092,6 +1096,9 @@ echo "Source path $source_path"
echo "C compiler $cc" echo "C compiler $cc"
echo "make $make" echo "make $make"
echo "CPU $cpu ($tune)" echo "CPU $cpu ($tune)"
if test "$BUILDSUF" != ""; then
echo "Build suffix $BUILDSUF"
fi
echo "Big Endian $bigendian" echo "Big Endian $bigendian"
echo "inttypes.h $inttypes" echo "inttypes.h $inttypes"
echo "broken inttypes.h $emu_fast_int" echo "broken inttypes.h $emu_fast_int"
...@@ -1186,11 +1193,12 @@ echo "SHCFLAGS=$SHCFLAGS">>config.mak ...@@ -1186,11 +1193,12 @@ echo "SHCFLAGS=$SHCFLAGS">>config.mak
echo "LDFLAGS=$LDFLAGS" >> config.mak echo "LDFLAGS=$LDFLAGS" >> config.mak
echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak
echo "SHFLAGS=$SHFLAGS" >> config.mak echo "SHFLAGS=$SHFLAGS" >> config.mak
echo "BUILDSUF=$BUILDSUF" >> config.mak
echo "LIBPREF=$LIBPREF" >> config.mak echo "LIBPREF=$LIBPREF" >> config.mak
echo "LIBSUF=$LIBSUF" >> config.mak echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak
echo "SLIBPREF=$SLIBPREF" >> config.mak echo "SLIBPREF=$SLIBPREF" >> config.mak
echo "SLIBSUF=$SLIBSUF" >> config.mak echo "SLIBSUF=\${BUILDSUF}$SLIBSUF" >> config.mak
echo "EXESUF=$EXESUF" >> config.mak echo "EXESUF=\${BUILDSUF}$EXESUF" >> config.mak
echo "TARGET_OS=$TARGET_OS" >> config.mak echo "TARGET_OS=$TARGET_OS" >> config.mak
if test "$cpu" = "x86" ; then if test "$cpu" = "x86" ; then
echo "TARGET_ARCH_X86=yes" >> config.mak echo "TARGET_ARCH_X86=yes" >> config.mak
......
...@@ -261,7 +261,7 @@ endif ...@@ -261,7 +261,7 @@ endif
ifeq ($(CONFIG_PP),yes) ifeq ($(CONFIG_PP),yes)
ifeq ($(SHARED_PP),yes) ifeq ($(SHARED_PP),yes)
EXTRALIBS += -L$(VPATH)/libpostproc -lpostproc EXTRALIBS += -L$(VPATH)/libpostproc -lpostproc$(BUILDSUF)
else else
# LIBS += libpostproc/libpostproc.a ... should be fixed # LIBS += libpostproc/libpostproc.a ... should be fixed
OBJS += libpostproc/postprocess.o OBJS += libpostproc/postprocess.o
......
...@@ -77,7 +77,7 @@ LIB= $(LIBPREF)avformat$(LIBSUF) ...@@ -77,7 +77,7 @@ LIB= $(LIBPREF)avformat$(LIBSUF)
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
SLIB= $(SLIBPREF)avformat$(SLIBSUF) SLIB= $(SLIBPREF)avformat$(SLIBSUF)
AVCLIBS+=-lavcodec -L../libavcodec AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec
ifeq ($(CONFIG_MP3LAME),yes) ifeq ($(CONFIG_MP3LAME),yes)
AVCLIBS+=-lmp3lame AVCLIBS+=-lmp3lame
endif endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment