[FFmpeg-cvslog] r11515 - in trunk: libavdevice/Makefile libavformat/Makefile
victor
subversion
Sat Jan 12 12:17:37 CET 2008
Author: victor
Date: Sat Jan 12 12:17:37 2008
New Revision: 11515
Log:
Link to libraries in dependency order.
Based on a patch by Gonzalo Garramu?o, ggarra advancedsl com ar
Modified:
trunk/libavdevice/Makefile
trunk/libavformat/Makefile
Modified: trunk/libavdevice/Makefile
==============================================================================
--- trunk/libavdevice/Makefile (original)
+++ trunk/libavdevice/Makefile Sat Jan 12 12:17:37 2008
@@ -4,9 +4,9 @@ NAME=avdevice
LIBVERSION=$(LAVDVERSION)
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)/libavformat -lavformat$(BUILDSUF) $(EXTRALIBS)
+ -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
CFLAGS += -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat
Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile (original)
+++ trunk/libavformat/Makefile Sat Jan 12 12:17:37 2008
@@ -158,8 +158,8 @@ OBJS-$(CONFIG_LIBNUT_MUXER)
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
OBJS+= avio.o aviobuf.o
More information about the ffmpeg-cvslog
mailing list