Browse Source

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>
tags/n2.2-rc1
James Almer Michael Niedermayer 12 years ago
parent
commit
a12f679a5d
2 changed files with 2 additions and 1 deletions
  1. +1
    -1
      common.mak
  2. +1
    -0
      configure

+ 1
- 1
common.mak View File

@@ -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) $<


+ 1
- 0
configure View File

@@ -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


Loading…
Cancel
Save