Browse Source

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
tags/v0.5
Víctor Paesa 17 years ago
parent
commit
a585c469a3
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      libavdevice/Makefile
  2. +2
    -2
      libavformat/Makefile

+ 2
- 2
libavdevice/Makefile View File

@@ -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




+ 2
- 2
libavformat/Makefile View File

@@ -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) \
-L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) $(EXTRALIBS)
EXTRALIBS := -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \
-L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)


# protocols I/O # protocols I/O
OBJS+= avio.o aviobuf.o OBJS+= avio.o aviobuf.o


Loading…
Cancel
Save