Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-22 05:06:43 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-07-22 05:06:43 +0400
commit135b1a3f2c7985b8336d170419aec6e30cd78043 (patch)
treec66258223e5b151c8d50e860c44af9896021ba04 /Makefile
parentab7c67905d1a97c274b24e268798d2f5fa2f6220 (diff)
parentd45ebd4876ab8fc07736a644de07e1b1d11a8e5d (diff)
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--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 2070aa4511..57f6a91c47 100644
--- a/Makefile
+++ b/Makefile
@@ -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