diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-10-15 12:59:45 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-10-15 12:59:45 +0000 |
| commit | 14f29f795d6b1a8a7d864ff97d6302bfe6fb0ba9 (patch) | |
| tree | b56f33bdd6218dbc1d7dea341b90e7bf303ec4f1 | |
| parent | 84471efd91a1599bf5c83bc2f7307017e27b4bd9 (diff) | |
| download | ffmpeg-14f29f795d6b1a8a7d864ff97d6302bfe6fb0ba9.tar.gz | |
Revert putting EXTRALIBS in common.mak, linking fails on MinGW.
Originally committed as revision 6700 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | common.mak | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/Makefile | 3 | ||||
| -rw-r--r-- | libpostproc/Makefile | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/common.mak b/common.mak index 21b2273da4..d045c0895d 100644 --- a/common.mak +++ b/common.mak @@ -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) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3d961b8fa1..611a022372 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -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) diff --git a/libavformat/Makefile b/libavformat/Makefile index 95be67b298..8c8e2b7073 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -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 diff --git a/libpostproc/Makefile b/libpostproc/Makefile index 6f95049a3b..8b7f5f96aa 100644 --- a/libpostproc/Makefile +++ b/libpostproc/Makefile @@ -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) |