mirror of https://git.ffmpeg.org/ffmpeg.git
fix lib order and remove nonsense avcodec double linking
Originally committed as revision 4029 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
4e4d983e8b
commit
efd9e75cb0
|
@ -55,8 +55,6 @@ endif
|
||||||
ifeq ($(CONFIG_AUDIO_BEOS),yes)
|
ifeq ($(CONFIG_AUDIO_BEOS),yes)
|
||||||
PPOBJS+= beosaudio.o
|
PPOBJS+= beosaudio.o
|
||||||
EXTRALIBS+=-lbe -lmedia
|
EXTRALIBS+=-lbe -lmedia
|
||||||
# this should be the default !
|
|
||||||
EXTRALIBS+=-lavcodec -L../libavcodec
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_NETWORK),yes)
|
ifeq ($(CONFIG_NETWORK),yes)
|
||||||
|
@ -78,11 +76,11 @@ endif
|
||||||
LIB= $(LIBPREF)avformat$(LIBSUF)
|
LIB= $(LIBPREF)avformat$(LIBSUF)
|
||||||
ifeq ($(BUILD_SHARED),yes)
|
ifeq ($(BUILD_SHARED),yes)
|
||||||
SLIB= $(SLIBPREF)avformat$(SLIBSUF)
|
SLIB= $(SLIBPREF)avformat$(SLIBSUF)
|
||||||
endif
|
|
||||||
|
|
||||||
EXTRALIBS+=-lavcodec -L../libavcodec
|
AVCLIBS+=-lavcodec -L../libavcodec
|
||||||
ifeq ($(CONFIG_MP3LAME),yes)
|
ifeq ($(CONFIG_MP3LAME),yes)
|
||||||
EXTRALIBS+=-lmp3lame
|
AVCLIBS+=-lmp3lame
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)
|
SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp)
|
||||||
|
@ -96,10 +94,10 @@ $(LIB): $(OBJS) $(PPOBJS)
|
||||||
|
|
||||||
$(SLIB): $(OBJS)
|
$(SLIB): $(OBJS)
|
||||||
ifeq ($(CONFIG_WIN32),yes)
|
ifeq ($(CONFIG_WIN32),yes)
|
||||||
$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
|
$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
|
||||||
-lib /machine:i386 /def:$(@:.dll=.def)
|
-lib /machine:i386 /def:$(@:.dll=.def)
|
||||||
else
|
else
|
||||||
$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS)
|
$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
depend: $(SRCS)
|
depend: $(SRCS)
|
||||||
|
|
Loading…
Reference in New Issue