From 5c2583a0ee9a6e824bb1633748c1899bc99a695c Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sun, 27 Apr 2008 14:54:57 +0300 Subject: Make MPlayer build with a complete FFmpeg checkout in ffmpeg/ Instead of separate checkouts of the FFmpeg libavutil/, libavcodec/, libavformat/, libpostproc/ subdirectories make MPlayer build with a complete checkout of FFmpeg under ffmpeg/. configure now creates config.mak and config.h at both the top level and in ffmpeg/. The config.h files are identical. The config.mak for FFmpeg has different include paths. The top-level common.mak and subdir.mak are now used by libswscale only; the directories under ffmpeg/ use the versions in ffmpeg/. --- common.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common.mak') diff --git a/common.mak b/common.mak index 1fbdf2b489..c33202f311 100644 --- a/common.mak +++ b/common.mak @@ -13,7 +13,7 @@ ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale CFLAGS = -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \ - $(addprefix -I$(SRC_PATH)/lib,$(ALLFFLIBS)) $(OPTFLAGS) + $(addprefix -I$(SRC_PATH)/ffmpeg/lib,$(ALLFFLIBS)) $(OPTFLAGS) %.o: %.c $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< -- cgit v1.2.3