diff options
| author | James Almer <jamrial@gmail.com> | 2013-12-08 22:44:52 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 02:47:55 +0100 |
| commit | a12f679a5db9a2069f58a993317720c5b4f82c27 (patch) | |
| tree | 4ee84ea6be908ee436ea57de56598186e6f3a288 | |
| parent | 0cde2ae3f1143547ebce0134fcaa559b8629de88 (diff) | |
| download | ffmpeg-a12f679a5db9a2069f58a993317720c5b4f82c27.tar.gz | |
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>
| -rw-r--r-- | common.mak | 2 | ||||
| -rwxr-xr-x | configure | 1 |
2 files changed, 2 insertions, 1 deletions
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) $< @@ -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 |