From 104e988ec2cf0cd88d3119ae5abd186f9109995f Mon Sep 17 00:00:00 2001 From: xufuji456 Date: Tue, 30 Aug 2022 11:06:26 +0800 Subject: [PATCH] Feature:move CMakeLists.txt to src/main/cpp --- app/build.gradle | 2 +- app/{ => src/main/cpp}/CMakeLists.txt | 64 +++++++++++++-------------- 2 files changed, 33 insertions(+), 33 deletions(-) rename app/{ => src/main/cpp}/CMakeLists.txt (54%) diff --git a/app/build.gradle b/app/build.gradle index a0dde26..f8d26ef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,7 +31,7 @@ android { externalNativeBuild { cmake { - path "CMakeLists.txt" + path "src/main/cpp/CMakeLists.txt" } } sourceSets { diff --git a/app/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt similarity index 54% rename from app/CMakeLists.txt rename to app/src/main/cpp/CMakeLists.txt index 4fa928d..efd2fa3 100644 --- a/app/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -18,33 +18,33 @@ add_library( # Sets the name of the library. # Provides a relative path to your source file(s). - src/main/cpp/ffmpeg/cmdutils.c - src/main/cpp/ffmpeg/ffmpeg.c - src/main/cpp/ffmpeg/ffmpeg_filter.c - src/main/cpp/ffmpeg/ffmpeg_opt.c - src/main/cpp/ffmpeg_cmd.c - src/main/cpp/ffmpeg/ffprobe.c - src/main/cpp/ffmpeg/ffmpeg_hw.c - src/main/cpp/audio_player.cpp - src/main/cpp/video_player.cpp - src/main/cpp/ffmpeg_pusher.cpp - src/main/cpp/video_filter.c - src/main/cpp/ffprobe_cmd.cpp - src/main/cpp/video_cutting.cpp - src/main/cpp/visualizer/fft.cpp - src/main/cpp/visualizer/fixed_fft.cpp - src/main/cpp/visualizer/block_queue.c - src/main/cpp/visualizer/frank_visualizer.cpp - src/main/cpp/visualizer/frank_visualizer_jni.cpp - src/main/cpp/visualizer/window.cpp - src/main/cpp/metadata/media_retriever.cpp - src/main/cpp/metadata/media_retriever_jni.cpp - src/main/cpp/metadata/metadata_util.c - src/main/cpp/metadata/ffmpeg_media_retriever.c - src/main/cpp/yuv/yuv_converter.cpp - src/main/cpp/media_transcode.cpp - src/main/cpp/audio_resample.cpp - src/main/cpp/pcm/pcm_process.cpp + ffmpeg/cmdutils.c + ffmpeg/ffmpeg.c + ffmpeg/ffmpeg_filter.c + ffmpeg/ffmpeg_opt.c + ffmpeg_cmd.c + ffmpeg/ffprobe.c + ffmpeg/ffmpeg_hw.c + audio_player.cpp + video_player.cpp + ffmpeg_pusher.cpp + video_filter.c + ffprobe_cmd.cpp + video_cutting.cpp + visualizer/fft.cpp + visualizer/fixed_fft.cpp + visualizer/block_queue.c + visualizer/frank_visualizer.cpp + visualizer/frank_visualizer_jni.cpp + visualizer/window.cpp + metadata/media_retriever.cpp + metadata/media_retriever_jni.cpp + metadata/metadata_util.c + metadata/ffmpeg_media_retriever.c + yuv/yuv_converter.cpp + media_transcode.cpp + audio_resample.cpp + pcm/pcm_process.cpp ) add_library( ffmpeg @@ -60,15 +60,15 @@ set_target_properties( ffmpeg set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") -include_directories(src/main/cpp) -include_directories(src/main/cpp/include) -include_directories(src/main/cpp/metadata) +include_directories(.) +include_directories(include) +include_directories(metadata) if(${CMAKE_ANDROID_ARCH_ABI} MATCHES "armeabi-v7a") - include_directories(src/main/cpp/include/armeabi-v7a) + include_directories(include/armeabi-v7a) message("This is armeabi-v7a") elseif(${CMAKE_ANDROID_ARCH_ABI} MATCHES "arm64-v8a") - include_directories(src/main/cpp/include/arm64-v8a) + include_directories(include/arm64-v8a) message("This is arm64-v8a") endif()