From a12f679a5db9a2069f58a993317720c5b4f82c27 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Sun, 8 Dec 2013 22:44:52 -0300
Subject: [PATCH] common.mak: Less ugly version of the previous windres fix

Using subst here is a really ugly hack

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 common.mak | 2 +-
 configure  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/common.mak b/common.mak
index 48f5c21bcf..50469a16a7 100644
--- a/common.mak
+++ b/common.mak
@@ -61,7 +61,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
 	$(COMPILE_HOSTC)
 
 %.o: %.rc
-	$(WINDRES) $(IFLAGS) --preprocessor "$(subst @,,$(DEPCC)) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $<
+	$(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $<
 
 %.i: %.c
 	$(CC) $(CCFLAGS) $(CC_E) $<
diff --git a/configure b/configure
index ed229548db..4eefa646fa 100755
--- a/configure
+++ b/configure
@@ -4911,6 +4911,7 @@ LD_LIB=$LD_LIB
 LD_PATH=$LD_PATH
 DLLTOOL=$dlltool
 WINDRES=$windres
+DEPWINDRES=$dep_cc
 LDFLAGS=$LDFLAGS
 SHFLAGS=$(echo $($ldflags_filter $SHFLAGS))
 ASMSTRIPFLAGS=$ASMSTRIPFLAGS