virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

build: introduce --progs-suffix option.

Browse Source
This commit is contained in:
Clément Bœsch
2011-08-29 17:52:03 +02:00
committed by Clément Bœsch
parent 3dd2c8bbbc
commit 33d9077001
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -24,8 +24,8 @@ TOOLS = qt-faststart trasher
TOOLS-$(CONFIG_ZLIB) += cws2fws TOOLS-$(CONFIG_ZLIB) += cws2fws
BASENAMES = ffmpeg avconv ffplay ffprobe ffserver BASENAMES = ffmpeg avconv ffplay ffprobe ffserver
ALLPROGS = $(BASENAMES:%=%$(EXESUF)) ALLPROGS = $(BASENAMES:%=%$(PROGSSUF)$(EXESUF))
ALLPROGS_G = $(BASENAMES:%=%_g$(EXESUF)) ALLPROGS_G = $(BASENAMES:%=%$(PROGSSUF)_g$(EXESUF))
ALLMANPAGES = $(BASENAMES:%=%.1) ALLMANPAGES = $(BASENAMES:%=%.1)
FFLIBS-$(CONFIG_AVDEVICE) += avdevice FFLIBS-$(CONFIG_AVDEVICE) += avdevice
@@ -48,9 +48,9 @@ FF_DEP_LIBS := $(DEP_LIBS)
all: $(PROGS) all: $(PROGS)
$(PROGS): %$(EXESUF): %_g$(EXESUF) $(PROGS): %$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
$(CP) $< $@ $(CP) $< $@$(PROGSSUF)
$(STRIP) $@ $(STRIP) $@$(PROGSSUF)
$(TOOLS): %$(EXESUF): %.o $(TOOLS): %$(EXESUF): %.o
$(LD) $(LDFLAGS) -o $@ $< $(ELIBS) $(LD) $(LDFLAGS) -o $@ $< $(ELIBS)
@@ -84,7 +84,7 @@ ffplay.o: CFLAGS += $(SDL_CFLAGS)
ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS) ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
ffserver_g$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS) ffserver_g$(EXESUF): LDFLAGS += $(FFSERVERLDFLAGS)
%_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS) %$(PROGSSUF)_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
$(LD) $(LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS) $(LD) $(LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
OBJDIRS += tools OBJDIRS += tools

6
configure vendored
View File

@@ -215,6 +215,7 @@ Advanced options (experts only):
--extra-libs=ELIBS add ELIBS [$ELIBS] --extra-libs=ELIBS add ELIBS [$ELIBS]
--extra-version=STRING version string suffix [] --extra-version=STRING version string suffix []
--build-suffix=SUFFIX library name suffix [] --build-suffix=SUFFIX library name suffix []
--progs-suffix=SUFFIX program name suffix []
--arch=ARCH select architecture [$arch] --arch=ARCH select architecture [$arch]
--cpu=CPU select the minimum required CPU (affects --cpu=CPU select the minimum required CPU (affects
instruction selection, may crash on older CPUs) instruction selection, may crash on older CPUs)
@@ -1177,6 +1178,7 @@ CMDLINE_SET="
arch arch
as as
build_suffix build_suffix
progs_suffix
cc cc
cpu cpu
cross_prefix cross_prefix
@@ -3170,6 +3172,9 @@ echo "ARCH $arch ($cpu)"
if test "$build_suffix" != ""; then if test "$build_suffix" != ""; then
echo "build suffix $build_suffix" echo "build suffix $build_suffix"
fi fi
if test "$progs_suffix" != ""; then
echo "progs suffix $progs_suffix"
fi
if test "$extra_version" != ""; then if test "$extra_version" != ""; then
echo "version string suffix $extra_version" echo "version string suffix $extra_version"
fi fi
@@ -3319,6 +3324,7 @@ FFSERVERLDFLAGS=$FFSERVERLDFLAGS
SHFLAGS=$SHFLAGS SHFLAGS=$SHFLAGS
YASMFLAGS=$YASMFLAGS YASMFLAGS=$YASMFLAGS
BUILDSUF=$build_suffix BUILDSUF=$build_suffix
PROGSSUF=$progs_suffix
FULLNAME=$FULLNAME FULLNAME=$FULLNAME
LIBPREF=$LIBPREF LIBPREF=$LIBPREF
LIBSUF=$LIBSUF LIBSUF=$LIBSUF