diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 15:24:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 15:24:38 +0100 |
| commit | 845bf99312d93d06760e0d2e453dec52b3b3e2d4 (patch) | |
| tree | 0e0d1e2e7a762b441771d8f8d152c62fdfd08c2d /common.mak | |
| parent | 42b411995caf218ab8fb0506ad219a69eba36598 (diff) | |
| parent | 4cc4b33f71d3982df404fceb4405d656c538bc74 (diff) | |
| download | ffmpeg-845bf99312d93d06760e0d2e453dec52b3b3e2d4.tar.gz | |
Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74'
* commit '4cc4b33f71d3982df404fceb4405d656c538bc74':
build: Add proper infrastructure for adding and checking host CPPFLAGS
Conflicts:
Makefile
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common.mak b/common.mak index c42ea9ff74..d6cb5f6aec 100644 --- a/common.mak +++ b/common.mak @@ -32,7 +32,7 @@ ASFLAGS := $(CPPFLAGS) $(ASFLAGS) CXXFLAGS += $(CPPFLAGS) $(CFLAGS) YASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm -HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS) +HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS) LDFLAGS := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS) define COMPILE |