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
...@@ -13,8 +13,6 @@ OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS) ...@@ -13,8 +13,6 @@ OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
STATIC_OBJS := $(OBJS) $(STATIC_OBJS) STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
SHARED_OBJS := $(OBJS) $(SHARED_OBJS) SHARED_OBJS := $(OBJS) $(SHARED_OBJS)
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
all: $(EXTRADEPS) $(LIB) $(SLIBNAME) all: $(EXTRADEPS) $(LIB) $(SLIBNAME)
$(LIB): $(STATIC_OBJS) $(LIB): $(STATIC_OBJS)
......
...@@ -399,6 +399,8 @@ CFLAGS += $(CFLAGS-yes) ...@@ -399,6 +399,8 @@ CFLAGS += $(CFLAGS-yes)
OBJS += $(OBJS-yes) OBJS += $(OBJS-yes)
ASM_OBJS += $(ASM_OBJS-yes) ASM_OBJS += $(ASM_OBJS-yes)
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
NAME=avcodec NAME=avcodec
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVCVERSION) LIBVERSION=$(LAVCVERSION)
......
...@@ -161,7 +161,8 @@ OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o ...@@ -161,7 +161,8 @@ OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o
OBJS-$(CONFIG_AUDIO_MUXER) += audio.o OBJS-$(CONFIG_AUDIO_MUXER) += audio.o
endif 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) ifeq ($(CONFIG_AUDIO_BEOS),yes)
CPPOBJS+= beosaudio.o CPPOBJS+= beosaudio.o
......
...@@ -4,6 +4,8 @@ include ../config.mak ...@@ -4,6 +4,8 @@ include ../config.mak
# Overload incdir, postproc include files go in a different directory. # Overload incdir, postproc include files go in a different directory.
incdir=$(prefix)/include/postproc incdir=$(prefix)/include/postproc
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
NAME=postproc NAME=postproc
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(SPPVERSION) LIBVERSION=$(SPPVERSION)
......
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