Commit a585c469 authored by Víctor Paesa's avatar Víctor Paesa

Link to libraries in dependency order.

Based on a patch by Gonzalo Garramuño, ggarra advancedsl com ar

Originally committed as revision 11515 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4eb7a735
...@@ -4,9 +4,9 @@ NAME=avdevice ...@@ -4,9 +4,9 @@ NAME=avdevice
LIBVERSION=$(LAVDVERSION) LIBVERSION=$(LAVDVERSION)
LIBMAJOR=$(LAVDMAJOR) LIBMAJOR=$(LAVDMAJOR)
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \ EXTRALIBS := -L$(BUILD_ROOT)/libavformat -lavformat$(BUILDSUF) \
-L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \ -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \
-L$(BUILD_ROOT)/libavformat -lavformat$(BUILDSUF) $(EXTRALIBS) -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
CFLAGS += -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat CFLAGS += -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat
......
...@@ -158,8 +158,8 @@ OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o riff.o ...@@ -158,8 +158,8 @@ OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o riff.o
OBJS-$(CONFIG_VHOOK) += framehook.o OBJS-$(CONFIG_VHOOK) += framehook.o
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \ EXTRALIBS := -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \
-L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) $(EXTRALIBS) -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
# protocols I/O # protocols I/O
OBJS+= avio.o aviobuf.o OBJS+= avio.o aviobuf.o
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment