diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 03:06:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 03:06:43 +0200 |
| commit | 135b1a3f2c7985b8336d170419aec6e30cd78043 (patch) | |
| tree | c66258223e5b151c8d50e860c44af9896021ba04 /Makefile | |
| parent | ab7c67905d1a97c274b24e268798d2f5fa2f6220 (diff) | |
| parent | d45ebd4876ab8fc07736a644de07e1b1d11a8e5d (diff) | |
| download | ffmpeg-135b1a3f2c7985b8336d170419aec6e30cd78043.tar.gz | |
Merge commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d'
* commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d':
configure: add support for neon intrinsics
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -92,6 +92,7 @@ $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V)))) SUBDIR := $(1)/ include $(SRC_PATH)/$(1)/Makefile -include $(SRC_PATH)/$(1)/$(ARCH)/Makefile +-include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile include $(SRC_PATH)/library.mak endef |