From da71226961ca024ca728252f54869dcc8c42f193 Mon Sep 17 00:00:00 2001 From: zhupengfei Date: Fri, 3 Apr 2020 15:39:36 +0800 Subject: [PATCH] externals: Add libyuv and jnigraphics --- .gitmodules | 3 +++ externals/CMakeLists.txt | 4 ++++ externals/libyuv | 1 + src/android/app/src/main/jni/CMakeLists.txt | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) create mode 160000 externals/libyuv diff --git a/.gitmodules b/.gitmodules index d4bc7837f..57d218517 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,3 +49,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..1203b7266 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -129,3 +129,7 @@ endif() # lodepng add_subdirectory(lodepng) + +# libyuv +add_subdirectory(libyuv) +target_include_directories(yuv INTERFACE ./libyuv/include) diff --git a/externals/libyuv b/externals/libyuv new file mode 160000 index 000000000..45f1f2b20 --- /dev/null +++ b/externals/libyuv @@ -0,0 +1 @@ +Subproject commit 45f1f2b201672b699b35da20267a5f2c41318264 diff --git a/src/android/app/src/main/jni/CMakeLists.txt b/src/android/app/src/main/jni/CMakeLists.txt index 3ed87339f..a5b72fa1b 100644 --- a/src/android/app/src/main/jni/CMakeLists.txt +++ b/src/android/app/src/main/jni/CMakeLists.txt @@ -19,6 +19,6 @@ add_library(main SHARED ) target_link_libraries(main PRIVATE common core input_common network) -target_link_libraries(main PRIVATE android EGL glad inih log) +target_link_libraries(main PRIVATE android jnigraphics EGL glad inih log yuv) set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} main)