[FFmpeg-cvslog] Fix compilation in subdir with NASM.
Reimar Döffinger
git at videolan.org
Sat Jun 25 19:16:14 CEST 2011
ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Fri Jun 24 10:04:22 2011 +0200| [c5cf0f7a76e80996bd6d2786408cd24bbef605de] | committer: Reimar Döffinger
Fix compilation in subdir with NASM.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c5cf0f7a76e80996bd6d2786408cd24bbef605de
---
common.mak | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/common.mak b/common.mak
index 9a59f77..66bbed4 100644
--- a/common.mak
+++ b/common.mak
@@ -26,7 +26,8 @@ $(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR))))
$(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_DIR)/%=%)); $(INSTALL))
endif
-IFLAGS := -I. -I$(SRC_PATH)
+# NASM requires -I path terminated with /
+IFLAGS := -I. -I$(SRC_PATH)/
CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
CFLAGS += $(ECFLAGS)
YASMFLAGS += $(IFLAGS) -Pconfig.asm
More information about the ffmpeg-cvslog
mailing list