From ea41ab8f47e874b661e6c6fff457767596d9a415 Mon Sep 17 00:00:00 2001 From: Zeqiang Li Date: Thu, 14 Apr 2022 18:12:30 +0800 Subject: [PATCH] conditional compile swappy (#247) --- sources/CMakeLists.txt | 12 ++++++++++-- sources/Swappy/src/swappy/CMakeLists.txt | 3 --- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 3ce8042f..e24782b7 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -47,16 +47,24 @@ endif() # add dependent boost libs include(${CMAKE_CURRENT_LIST_DIR}/boost-source/boost.cmake) +if(ANDROID AND CC_ENABLE_SWAPPY) + +include(${CMAKE_CURRENT_LIST_DIR}/Swappy/src/swappy/CMakeLists.txt) +list(APPEND CC_EXTERNAL_LIBS + swappy +) +add_definitions(-DCC_SWAPPY_ENABLED) + +endif() + if(ANDROID OR OHOS) include(${CMAKE_CURRENT_LIST_DIR}/pvmp3dec/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/tremolo/CMakeLists.txt) - include(${CMAKE_CURRENT_LIST_DIR}/Swappy/src/swappy/CMakeLists.txt) list(APPEND CC_EXTERNAL_LIBS pvmp3dec vorbisidec - swappy ) elseif(WINDOWS) diff --git a/sources/Swappy/src/swappy/CMakeLists.txt b/sources/Swappy/src/swappy/CMakeLists.txt index 33c3c15a..61810b28 100644 --- a/sources/Swappy/src/swappy/CMakeLists.txt +++ b/sources/Swappy/src/swappy/CMakeLists.txt @@ -112,9 +112,6 @@ add_library(swappy SHARED ${SWAPPY_C_SRC}) -set(SWAPPY_ENABLED FALSE) -add_definitions(-DSWAPPY_ENABLED) - set(LIBS swappy_static android