diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-10-13 00:45:09 +0000 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-06-21 17:00:29 -0300 |
| commit | 0cc0c5b6dbf187f9c096de03d999da040197ffe6 (patch) | |
| tree | 554fd3ccd665715ceec7d2c9e1c1545368f55570 /ffbuild | |
| parent | fd502f4f5fe8d2f241102ca9a529aa7f88209c22 (diff) | |
| download | ffmpeg-streaming-0cc0c5b6dbf187f9c096de03d999da040197ffe6.zip ffmpeg-streaming-0cc0c5b6dbf187f9c096de03d999da040197ffe6.tar.gz | |
build: Allow generating dependencies as a side-effect of assembling
(Cherry-picked from libav commit 3c0efbd03349ae68d3a25a082222652a102e3fd4)
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'ffbuild')
| -rw-r--r-- | ffbuild/common.mak | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ffbuild/common.mak b/ffbuild/common.mak index b029e2a..e168fb2 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -37,7 +37,7 @@ OBJCFLAGS += $(EOBJCFLAGS) OBJCCFLAGS = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS) ASFLAGS := $(CPPFLAGS) $(ASFLAGS) CXXFLAGS := $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) -X86ASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm +X86ASMFLAGS += $(IFLAGS:%=%/) -I$(<D)/ -Pconfig.asm NVCCFLAGS += -ptx HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS) @@ -52,6 +52,7 @@ COMPILE_C = $(call COMPILE,CC) COMPILE_CXX = $(call COMPILE,CXX) COMPILE_S = $(call COMPILE,AS) COMPILE_M = $(call COMPILE,OBJCC) +COMPILE_X86ASM = $(call COMPILE,X86ASM) COMPILE_HOSTC = $(call COMPILE,HOSTCC) COMPILE_NVCC = $(call COMPILE,NVCC) @@ -74,12 +75,11 @@ COMPILE_NVCC = $(call COMPILE,NVCC) $(COMPILE_HOSTC) %$(DEFAULT_X86ASMD).asm: %.asm - $(DEPX86ASM) $(X86ASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.asm=.d) - $(X86ASM) $(X86ASMFLAGS) -I $(<D)/ -e $< | sed '/^%/d;/^$$/d;' > $@ + $(DEPX86ASM) $(X86ASMFLAGS) -M -o $@ $< > $(@:.asm=.d) + $(X86ASM) $(X86ASMFLAGS) -e $< | sed '/^%/d;/^$$/d;' > $@ %.o: %.asm - $(DEPX86ASM) $(X86ASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d) - $(X86ASM) $(X86ASMFLAGS) -I $(<D)/ -o $@ $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) + $(COMPILE_X86ASM) -$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@) %.o: %.rc |
