From 1911c9791e15ade30fe2ac4c248f41cd36a07618 Mon Sep 17 00:00:00 2001 From: xperia64 Date: Sun, 12 Dec 2021 09:52:30 -0500 Subject: [PATCH] Add libyuv (#5623) * Add libyuv * Only use libyuv on Android Co-authored-by: Marshall Mohror --- .gitmodules | 3 +++ externals/CMakeLists.txt | 7 +++++++ externals/libyuv | 1 + 3 files changed, 11 insertions(+) create mode 160000 externals/libyuv diff --git a/.gitmodules b/.gitmodules index 5e6ce5491..126b75c01 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,3 +52,6 @@ [submodule "zstd"] path = externals/zstd url = https://github.com/facebook/zstd.git +[submodule "libyuv"] + path = externals/libyuv + url = https://github.com/lemenkov/libyuv.git diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 24e881b19..9d527d356 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -129,3 +129,10 @@ endif() # lodepng add_subdirectory(lodepng) + +# (xperia64): Only use libyuv on Android b/c of build issues on Windows and mandatory JPEG +if(ANDROID) + # libyuv + add_subdirectory(libyuv) + target_include_directories(yuv INTERFACE ./libyuv/include) +endif() diff --git a/externals/libyuv b/externals/libyuv new file mode 160000 index 000000000..19d71f6b3 --- /dev/null +++ b/externals/libyuv @@ -0,0 +1 @@ +Subproject commit 19d71f6b351fe992ae34b114eebd872c383a6bdb