RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-20 15:26:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move back jansson_path as it's not part of upstream and breaks usage of system jansson lib

Browse source
This commit is contained in:
Philippe Teuwen 2020-10-07 01:11:40 +02:00
parent 7ea0324a62
commit 3872b5bd66
5 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/CMakeLists.txt
View file

@ -283,6 +283,7 @@ set (TARGET_SOURCES
${PM3_ROOT}/client/src/fileutils.c ${PM3_ROOT}/client/src/fileutils.c
${PM3_ROOT}/client/src/flash.c ${PM3_ROOT}/client/src/flash.c
${PM3_ROOT}/client/src/graph.c ${PM3_ROOT}/client/src/graph.c
${PM3_ROOT}/client/src/jansson_path.c
${PM3_ROOT}/client/src/preferences.c ${PM3_ROOT}/client/src/preferences.c
${PM3_ROOT}/client/src/pm3_binlib.c ${PM3_ROOT}/client/src/pm3_binlib.c
${PM3_ROOT}/client/src/pm3_bitlib.c ${PM3_ROOT}/client/src/pm3_bitlib.c

1
client/Makefile
View file

@ -505,6 +505,7 @@ SRCS = aidsearch.c \
flash.c \ flash.c \
generator.c \ generator.c \
graph.c \ graph.c \
jansson_path.c \
loclass/cipher.c \ loclass/cipher.c \
loclass/cipherutils.c \ loclass/cipherutils.c \
loclass/elite_crack.c \ loclass/elite_crack.c \

3
client/deps/jansson/Makefile
View file

@ -13,8 +13,7 @@ MYSRCS = \
strbuffer.c \ strbuffer.c \
strconv.c \ strconv.c \
utf.c \ utf.c \
value.c \ value.c
jansson_path.c
LIB_A = libjansson.a LIB_A = libjansson.a

0
client/deps/jansson/jansson_path.c → client/src/jansson_path.c
View file

0
client/deps/jansson/jansson_path.h → client/src/jansson_path.h
View file