]> git.sesse.net Git - ffmpeg/commitdiff
Have EXTRALIBS appear after other link options, fixes shared build on Cygwin.
authorDiego Biurrun <diego@biurrun.de>
Sat, 15 Apr 2006 15:05:53 +0000 (15:05 +0000)
committerDiego Biurrun <diego@biurrun.de>
Sat, 15 Apr 2006 15:05:53 +0000 (15:05 +0000)
based on patch by Marcus Engene, ffmpeg AATT engene DDOOTT se

Originally committed as revision 5295 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/Makefile
libavformat/Makefile

index 42796e493e564f850802e7fc19cc1bfd7e2dfca1..d8e246254d3e43f4f9ed3d8f85aaa2a45027a1a4 100644 (file)
@@ -293,7 +293,7 @@ OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
 endif
 endif
 
-EXTRALIBS += -L../libavutil -lavutil$(BUILDSUF)
+EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
 
 # currently using libdts for dts decoding
 ifeq ($(CONFIG_DTS),yes)
index 42bc01f9ecebb70c025604dae048f63cd202afdc..e5e7efaec6788f4336b9116a13fb86501aa964d3 100644 (file)
@@ -66,7 +66,7 @@ ifeq ($(CONFIG_AUDIO_OSS),yes)
 OBJS+= audio.o
 endif
 
-EXTRALIBS += -L../libavutil -lavutil$(BUILDSUF) -lavcodec$(BUILDSUF) -L../libavcodec
+EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) -lavcodec$(BUILDSUF) -L../libavcodec $(EXTRALIBS)
 
 ifeq ($(CONFIG_AUDIO_BEOS),yes)
 CPPOBJS+= beosaudio.o