Browse code

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>

James Almer authored on 2013/12/09 10:44:52
Showing 2 changed files
... ...
@@ -61,7 +61,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
61 61
 	$(COMPILE_HOSTC)
62 62
 
63 63
 %.o: %.rc
64
-	$(WINDRES) $(IFLAGS) --preprocessor "$(subst @,,$(DEPCC)) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $<
64
+	$(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $<
65 65
 
66 66
 %.i: %.c
67 67
 	$(CC) $(CCFLAGS) $(CC_E) $<
... ...
@@ -4911,6 +4911,7 @@ LD_LIB=$LD_LIB
4911 4911
 LD_PATH=$LD_PATH
4912 4912
 DLLTOOL=$dlltool
4913 4913
 WINDRES=$windres
4914
+DEPWINDRES=$dep_cc
4914 4915
 LDFLAGS=$LDFLAGS
4915 4916
 SHFLAGS=$(echo $($ldflags_filter $SHFLAGS))
4916 4917
 ASMSTRIPFLAGS=$ASMSTRIPFLAGS