diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-29 04:34:58 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-29 05:03:57 +0300 |
| commit | 06a35804f37754e2d6ec5bdebe9d83fcddb1caf6 (patch) | |
| tree | eb14069a6843691395ed20773c8768e91a5c1153 /common.mak | |
| parent | e1ef11f0f62cac4a848a4cc9bba2f06dee8fd362 (diff) | |
| parent | 7398abf3899f953eda95d925df6bcc64b08461ed (diff) | |
| download | mpv-06a35804f37754e2d6ec5bdebe9d83fcddb1caf6.tar.bz2 mpv-06a35804f37754e2d6ec5bdebe9d83fcddb1caf6.tar.xz | |
Merge svn changes up to r26587
Conflicts:
Makefile
configure
osdep/timer-darwin.c
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 c33202f311..1d47b4a9bf 100644 --- a/common.mak +++ b/common.mak @@ -12,7 +12,7 @@ vpath %.S $(SRC_DIR) 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) \ + -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/ffmpeg\ $(addprefix -I$(SRC_PATH)/ffmpeg/lib,$(ALLFFLIBS)) $(OPTFLAGS) %.o: %.c |