Skip to content
Snippets Groups Projects
Commit 14f29f79 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Revert putting EXTRALIBS in common.mak, linking fails on MinGW.

Originally committed as revision 6700 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 84471efd
No related branches found
No related tags found
No related merge requests found
......@@ -13,8 +13,6 @@ OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
SHARED_OBJS := $(OBJS) $(SHARED_OBJS)
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
all: $(EXTRADEPS) $(LIB) $(SLIBNAME)
$(LIB): $(STATIC_OBJS)
......
......@@ -399,6 +399,8 @@ CFLAGS += $(CFLAGS-yes)
OBJS += $(OBJS-yes)
ASM_OBJS += $(ASM_OBJS-yes)
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
NAME=avcodec
ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVCVERSION)
......
......@@ -161,7 +161,8 @@ OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o
OBJS-$(CONFIG_AUDIO_MUXER) += audio.o
endif
EXTRALIBS := -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
-lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
ifeq ($(CONFIG_AUDIO_BEOS),yes)
CPPOBJS+= beosaudio.o
......
......@@ -4,6 +4,8 @@ include ../config.mak
# Overload incdir, postproc include files go in a different directory.
incdir=$(prefix)/include/postproc
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
NAME=postproc
ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(SPPVERSION)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment