dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make/cmake cliparser lib and remove redundant getopt from reveng

Browse Source
This commit is contained in:
Philippe Teuwen
2020-04-19 12:14:56 +02:00
parent 5f4385986c
commit 4967096e3b
9 changed files with 37 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/CMakeLists.txt
View File

@@ -78,8 +78,6 @@ set (TARGET_SOURCES
../common/iso15693tools.c
../common/cardhelper.c
../common/generator.c
deps/cliparser/argtable3.c
deps/cliparser/cliparser.c
src/crypto/asn1dump.c
src/crypto/asn1utils.c
src/crypto/libpcrypto.c
@@ -245,7 +243,6 @@ target_include_directories(proxmark3 PRIVATE
..
../common
../include
deps/cliparser
src
src/uart
)
@@ -256,6 +253,7 @@ if (APPLE)
endif (APPLE)
find_library(cliparser REQUIRED)
find_library(jansson REQUIRED)
find_library(tinycbor REQUIRED)
find_library(lua REQUIRED)
@@ -264,7 +262,7 @@ find_library(reveng REQUIRED)
find_library(z REQUIRED)
find_library(hardnested REQUIRED)
target_link_libraries(proxmark3 PRIVATE readline pthread m mbedtls jansson lua tinycbor amiibo reveng z hardnested ${ADDITIONAL_LNK})
target_link_libraries(proxmark3 PRIVATE readline pthread m mbedtls cliparser jansson lua tinycbor amiibo reveng z hardnested ${ADDITIONAL_LNK})
install(TARGETS proxmark3 DESTINATION "bin")
install(DIRECTORY cmdscripts lualibs luascripts resources dictionaries DESTINATION "share/proxmark3")