From 9d0807cd5bf5fdbefbd71caf6763f5766164ec4b Mon Sep 17 00:00:00 2001 From: Johann Date: Thu, 2 Apr 2020 10:06:43 +0900 Subject: [PATCH] x86inc.asm: pull settings from libvpx Reapply 1be46ef6b. Include vpx_config.asm and prefix functions with vpx. BUG=webm:1679 Change-Id: I5fba3154203822a829bc88ad0e302adf2ce3bbee --- third_party/x86inc/README.libvpx_new | 2 ++ third_party/x86inc/x86inc.asm_new | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/third_party/x86inc/README.libvpx_new b/third_party/x86inc/README.libvpx_new index 728337b..6bb8165 100644 --- a/third_party/x86inc/README.libvpx_new +++ b/third_party/x86inc/README.libvpx_new @@ -8,3 +8,5 @@ x264/libav's framework for x86 assembly. Contains a variety of macros and defines that help automatically allow assembly to work cross-platform. Local Modifications: +Get configuration from vpx_config.asm. +Prefix functions with vpx by default. diff --git a/third_party/x86inc/x86inc.asm_new b/third_party/x86inc/x86inc.asm_new index 24540e3..7b10249 100644 --- a/third_party/x86inc/x86inc.asm_new +++ b/third_party/x86inc/x86inc.asm_new @@ -34,8 +34,10 @@ ; as this feature might be useful for others as well. Send patches or ideas ; to x264-devel@videolan.org . +%include "vpx_config.asm" + %ifndef private_prefix - %define private_prefix x264 + %define private_prefix vpx %endif %ifndef public_prefix -- 2.7.4