diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 09271f1c4..d3064bffb 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -497,20 +497,10 @@ if (NOT APPLE) set(ADDITIONAL_LNK ${ADDITIONAL_LNK} -Wl,--as-needed -latomic -Wl,--no-as-needed) endif (NOT APPLE) - -find_library(pm3rrg_rdv4_cliparser REQUIRED) -find_library(pm3rrg_rdv4_tinycbor REQUIRED) -find_library(pm3rrg_rdv4_lua REQUIRED) -find_library(pm3rrg_rdv4_mbedtls REQUIRED) -find_library(pm3rrg_rdv4_reveng REQUIRED) -find_library(pm3rrg_rdv4_hardnested REQUIRED) - if (NOT JANSSON_FOUND) - find_library(pm3rrg_rdv4_jansson REQUIRED) set(ADDITIONAL_LNK pm3rrg_rdv4_jansson ${ADDITIONAL_LNK}) endif (NOT JANSSON_FOUND) if (NOT WHEREAMI_FOUND) - find_library(pm3rrg_rdv4_whereami REQUIRED) set(ADDITIONAL_LNK pm3rrg_rdv4_whereami ${ADDITIONAL_LNK}) endif (NOT WHEREAMI_FOUND) diff --git a/client/android/CMakeLists.txt b/client/android/CMakeLists.txt index cafd11e7f..fcc4583fb 100644 --- a/client/android/CMakeLists.txt +++ b/client/android/CMakeLists.txt @@ -13,7 +13,6 @@ add_subdirectory(../deps deps) if (CMAKE_MAKE_PROGRAM MATCHES ".*ninja.*") set(BZIP2_INCLUDE_DIRS ${BZIP2_ROOT}) set(BZIP2_LIBRARIES pm3rrg_rdv4_bzip2) - find_library(pm3rrg_rdv4_bzip2 REQUIRED) elseif (UNIX) # Cross compile at Unix Makefile System. # bzip2 dep. include(ExternalProject) @@ -191,15 +190,6 @@ target_include_directories(pm3rrg_rdv4 PRIVATE ${PM3_ROOT}/common_fpga ${PM3_ROOT}/client/src) -find_library(pm3rrg_rdv4_cliparser REQUIRED) -find_library(pm3rrg_rdv4_jansson REQUIRED) -find_library(pm3rrg_rdv4_tinycbor REQUIRED) -find_library(pm3rrg_rdv4_lua REQUIRED) -find_library(pm3rrg_rdv4_mbedtls REQUIRED) -find_library(pm3rrg_rdv4_reveng REQUIRED) -find_library(pm3rrg_rdv4_hardnested REQUIRED) -find_library(pm3rrg_rdv4_whereami REQUIRED) - target_link_libraries(pm3rrg_rdv4 ${BZIP2_LIBRARIES} pm3rrg_rdv4_hardnested diff --git a/client/deps/amiibo.cmake b/client/deps/amiibo.cmake index 234547cd1..491d90d60 100644 --- a/client/deps/amiibo.cmake +++ b/client/deps/amiibo.cmake @@ -14,7 +14,6 @@ add_library(pm3rrg_rdv4_amiibo STATIC if (NOT TARGET pm3rrg_rdv4_mbedtls) include(mbedtls.cmake) endif() -find_library(pm3rrg_rdv4_mbedtls REQUIRED) target_link_libraries(pm3rrg_rdv4_amiibo PRIVATE m pm3rrg_rdv4_mbedtls)