Browse Source

Have EXTRALIBS appear after other link options, fixes shared build on Cygwin.

based on patch by Marcus Engene, ffmpeg AATT engene DDOOTT se

Originally committed as revision 5295 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Diego Biurrun 19 years ago
parent
commit
2cf30841b5
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      libavcodec/Makefile
  2. +1
    -1
      libavformat/Makefile

+ 1
- 1
libavcodec/Makefile View File

@@ -293,7 +293,7 @@ OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
endif endif
endif endif


EXTRALIBS += -L../libavutil -lavutil$(BUILDSUF)
EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)


# currently using libdts for dts decoding # currently using libdts for dts decoding
ifeq ($(CONFIG_DTS),yes) ifeq ($(CONFIG_DTS),yes)


+ 1
- 1
libavformat/Makefile View File

@@ -66,7 +66,7 @@ ifeq ($(CONFIG_AUDIO_OSS),yes)
OBJS+= audio.o OBJS+= audio.o
endif 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) ifeq ($(CONFIG_AUDIO_BEOS),yes)
CPPOBJS+= beosaudio.o CPPOBJS+= beosaudio.o


Loading…
Cancel
Save