[FFmpeg-cvslog] common.mak: fix the current fate failures with windres

James Almer git at videolan.org
Mon Dec 9 02:18:13 CET 2013


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Dec  8 15:57:36 2013 -0300| [5f302b1f3819f603349a921458197fa5c35dc396] | committer: Michael Niedermayer

common.mak: fix the current fate failures with windres

Tested-by: Hendrik Leppkes <h.leppkes at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f302b1f3819f603349a921458197fa5c35dc396
---

 common.mak |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.mak b/common.mak
index d4d5fcb..48f5c21 100644
--- a/common.mak
+++ b/common.mak
@@ -61,7 +61,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
 	$(COMPILE_HOSTC)
 
 %.o: %.rc
-	$(WINDRES) $(IFLAGS) --preprocessor "$(DEPCC) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $<
+	$(WINDRES) $(IFLAGS) --preprocessor "$(subst @,,$(DEPCC)) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $<
 
 %.i: %.c
 	$(CC) $(CCFLAGS) $(CC_E) $<



More information about the ffmpeg-cvslog mailing list