diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-27 14:54:57 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-28 12:16:12 +0300 |
| commit | 5c2583a0ee9a6e824bb1633748c1899bc99a695c (patch) | |
| tree | bcbe0a0268049ac38ded39f74ee851f5b12dcb20 /common.mak | |
| parent | 2faffe2a7f4076beb461c34428d42b13e0414283 (diff) | |
| download | mpv-5c2583a0ee9a6e824bb1633748c1899bc99a695c.tar.bz2 mpv-5c2583a0ee9a6e824bb1633748c1899bc99a695c.tar.xz | |
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/.
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 2 |
1 files changed, 1 insertions, 1 deletions
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 $@ $< |