diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-30 17:28:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-30 17:28:21 +0200 |
| commit | e8e4c8bddee7b77747346ca5047a84cc40dafc11 (patch) | |
| tree | 8062747ec4d71f28da7fc9377af81cea3394022b /common.mak | |
| parent | f4c020e3ad0a2a1412cc94b3d7df7063b37ae429 (diff) | |
| parent | 8db73c61a7b24bc4f4d3d415bea2990d17d16354 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: allow non-standard variations of linker -l/-L flags
Add reminders to update the codec descriptor list with new codec IDs.
Conflicts:
Makefile
configure
libavcodec/avcodec.h
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common.mak b/common.mak index 14c6508a6c..172664011c 100644 --- a/common.mak +++ b/common.mak @@ -33,7 +33,7 @@ CXXFLAGS += $(CPPFLAGS) $(CFLAGS) YASMFLAGS += $(IFLAGS:%=%/) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS) -LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS) +LDFLAGS := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS) define COMPILE $(call $(1)DEP,$(1)) @@ -82,7 +82,8 @@ OBJS += $(OBJS-yes) FFLIBS := $(FFLIBS-yes) $(FFLIBS) TESTPROGS += $(TESTPROGS-yes) -FFEXTRALIBS := $(FFLIBS:%=-l%$(BUILDSUF)) $(EXTRALIBS) +LDLIBS = $(FFLIBS:%=%$(BUILDSUF)) +FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(EXTRALIBS) EXAMPLES := $(EXAMPLES:%=$(SUBDIR)%-example$(EXESUF)) OBJS := $(sort $(OBJS:%=$(SUBDIR)%)) |