virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055'

Browse Source 
* commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055':
  build: Drop arch-specific checkasm Makefiles

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-03-23 18:01:47 -03:00
commit f23078904f
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/checkasm/Makefile
View File

@ -30,7 +30,9 @@ AVFILTEROBJS-$(CONFIG_COLORSPACE_FILTER) += vf_colorspace.o
CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes)
-include $(SRC_PATH)/tests/checkasm/$(ARCH)/Makefile
CHECKASMOBJS-$(ARCH_AARCH64) += aarch64/checkasm.o
CHECKASMOBJS-$(HAVE_ARMV5TE_EXTERNAL) += arm/checkasm.o
CHECKASMOBJS-$(HAVE_YASM) += x86/checkasm.o
CHECKASMOBJS += $(CHECKASMOBJS-yes) checkasm.o
CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%))

1
tests/checkasm/aarch64/Makefile
View File

@ -1 +0,0 @@
CHECKASMOBJS += aarch64/checkasm.o

1
tests/checkasm/arm/Makefile
View File

@ -1 +0,0 @@
CHECKASMOBJS-$(HAVE_ARMV5TE_EXTERNAL) += arm/checkasm.o

1
tests/checkasm/x86/Makefile
View File

@ -1 +0,0 @@
CHECKASMOBJS-$(HAVE_YASM) += x86/checkasm.o