virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '7e90133f6420b1c53652f972b9561600822881ee'

Browse Source 
* commit '7e90133f6420b1c53652f972b9561600822881ee':
  build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined

Conflicts:
	common.mak

See: efa9596831
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-14 14:02:19 +02:00
commit dbd1fdd214
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common.mak
View File

@ -93,10 +93,7 @@ include $(SRC_PATH)/arch.mak
OBJS += $(OBJS-yes) OBJS += $(OBJS-yes)
SLIBOBJS += $(SLIBOBJS-yes) SLIBOBJS += $(SLIBOBJS-yes)
FFLIBS := $(FFLIBS-yes) $(FFLIBS) FFLIBS := $(FFLIBS-$(if $(NAME),$(NAME),no)) $(FFLIBS-yes) $(FFLIBS)
ifdef NAME
FFLIBS := $(FFLIBS-$(NAME)) $(FFLIBS)
endif
TESTPROGS += $(TESTPROGS-yes) TESTPROGS += $(TESTPROGS-yes)
LDLIBS = $(FFLIBS:%=%$(BUILDSUF)) LDLIBS = $(FFLIBS:%=%$(BUILDSUF))