diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 13:57:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 13:57:09 +0100 |
| commit | 9766d9c9851577d8162d5f006dffc721902a1409 (patch) | |
| tree | 938847263d4b058201617e0cdc5bd50ed098af7f /common.mak | |
| parent | 264f12342c3e71e4ecc9a2993e656e064f774105 (diff) | |
| parent | 04581c8c77ce779e4e70684ac45302972766be0f (diff) | |
| download | ffmpeg-9766d9c9851577d8162d5f006dffc721902a1409.tar.gz | |
Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'
* commit '04581c8c77ce779e4e70684ac45302972766be0f':
x86: yasm: Use complete source path for macro helper %includes
Conflicts:
Makefile
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 2d78cf8fb2..751085d86e 100644 --- a/common.mak +++ b/common.mak @@ -30,7 +30,7 @@ CFLAGS += $(ECFLAGS) CCFLAGS = $(CPPFLAGS) $(CFLAGS) ASFLAGS := $(CPPFLAGS) $(ASFLAGS) CXXFLAGS += $(CPPFLAGS) $(CFLAGS) -YASMFLAGS += $(IFLAGS:%=%/) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm +YASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS) LDFLAGS := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS) |