Mercurial > libavformat.hg

comparison Makefile @ 1392:a35c953d4561 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert putting EXTRALIBS in common.mak, linking fails on MinGW.
author diego
date Sun, 15 Oct 2006 12:59:45 +0000
parents 0fda3bce9fd9
children f1614c754d5b
comparison
equal deleted inserted replaced
1391:669d33f6dde5 1392:a35c953d4561
159 ifeq ($(CONFIG_AUDIO_OSS),yes) 159 ifeq ($(CONFIG_AUDIO_OSS),yes)
160 OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o 160 OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o
161 OBJS-$(CONFIG_AUDIO_MUXER) += audio.o 161 OBJS-$(CONFIG_AUDIO_MUXER) += audio.o
162 endif 162 endif
163 163
164 EXTRALIBS := -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS) 164 EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
165 -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
165 166
166 ifeq ($(CONFIG_AUDIO_BEOS),yes) 167 ifeq ($(CONFIG_AUDIO_BEOS),yes)
167 CPPOBJS+= beosaudio.o 168 CPPOBJS+= beosaudio.o
168 endif 169 endif
169 170