diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-23 17:48:28 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-23 17:57:35 -0300 |
| commit | 3ddae9eee9a8bc4c667a66a9b1db36b84edca436 (patch) | |
| tree | 02c5b3dfa2b9b786c43f566a82ee8c508c67d57a /common.mak | |
| parent | 67b639b496268d1d2b0ec64978f754ab692c44d1 (diff) | |
| parent | 93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81 (diff) | |
| download | ffmpeg-3ddae9eee9a8bc4c667a66a9b1db36b84edca436.tar.gz | |
Merge commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81'
* commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81':
build: Drop duplicate asm recipe
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/common.mak b/common.mak index 7815c3f359..3c645adbfa 100644 --- a/common.mak +++ b/common.mak @@ -74,6 +74,15 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC) %_host.o: %.c $(COMPILE_HOSTC) +%$(DEFAULT_YASMD).asm: %.asm + $(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.asm=.d) + $(YASM) $(YASMFLAGS) -I $(<D)/ -e $< | sed '/^%/d;/^$$/d;' > $@ + +%.o: %.asm + $(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d) + $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) + -$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@) + %.o: %.rc $(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $< |