mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2024-11-10 17:49:32 +08:00
adapting cmakefile to the client cmakefile.
This commit is contained in:
parent
01aaad7866
commit
c3543c4610
1 changed files with 5 additions and 1 deletions
|
@ -166,11 +166,12 @@ endif (NOT SKIPJANSSONSYSTEM EQUAL 1)
|
||||||
if(EMBED_BZIP2)
|
if(EMBED_BZIP2)
|
||||||
cmake_policy(SET CMP0114 NEW)
|
cmake_policy(SET CMP0114 NEW)
|
||||||
set(BZIP2_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/deps/bzip2/src/bzip2)
|
set(BZIP2_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/deps/bzip2/src/bzip2)
|
||||||
|
# Specify SOURCE_DIR will cause some errors
|
||||||
ExternalProject_Add(bzip2
|
ExternalProject_Add(bzip2
|
||||||
GIT_REPOSITORY https://android.googlesource.com/platform/external/bzip2
|
GIT_REPOSITORY https://android.googlesource.com/platform/external/bzip2
|
||||||
GIT_TAG platform-tools-30.0.2
|
GIT_TAG platform-tools-30.0.2
|
||||||
PREFIX deps/bzip2
|
PREFIX deps/bzip2
|
||||||
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/bzip2
|
# SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/bzip2
|
||||||
CONFIGURE_COMMAND mkdir -p ${BZIP2_BUILD_DIR} && git archive --format tar HEAD | tar -C ${BZIP2_BUILD_DIR} -x
|
CONFIGURE_COMMAND mkdir -p ${BZIP2_BUILD_DIR} && git archive --format tar HEAD | tar -C ${BZIP2_BUILD_DIR} -x
|
||||||
BUILD_IN_SOURCE ON
|
BUILD_IN_SOURCE ON
|
||||||
BUILD_COMMAND make -C ${BZIP2_BUILD_DIR} -j4 CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} AR=${CMAKE_AR} RANLIB=${CMAKE_RANLIB} ${CFLAGS_EXTERNAL_LIB} libbz2.a
|
BUILD_COMMAND make -C ${BZIP2_BUILD_DIR} -j4 CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} AR=${CMAKE_AR} RANLIB=${CMAKE_RANLIB} ${CFLAGS_EXTERNAL_LIB} libbz2.a
|
||||||
|
@ -279,6 +280,7 @@ set (TARGET_SOURCES
|
||||||
${PM3_ROOT}/client/src/mifare/mifare4.c
|
${PM3_ROOT}/client/src/mifare/mifare4.c
|
||||||
${PM3_ROOT}/client/src/mifare/mifaredefault.c
|
${PM3_ROOT}/client/src/mifare/mifaredefault.c
|
||||||
${PM3_ROOT}/client/src/mifare/mifarehost.c
|
${PM3_ROOT}/client/src/mifare/mifarehost.c
|
||||||
|
${PM3_ROOT}/client/src/mifare/gen4.c
|
||||||
${PM3_ROOT}/client/src/nfc/ndef.c
|
${PM3_ROOT}/client/src/nfc/ndef.c
|
||||||
${PM3_ROOT}/client/src/mifare/lrpcrypto.c
|
${PM3_ROOT}/client/src/mifare/lrpcrypto.c
|
||||||
${PM3_ROOT}/client/src/mifare/desfirecrypto.c
|
${PM3_ROOT}/client/src/mifare/desfirecrypto.c
|
||||||
|
@ -657,6 +659,8 @@ if (MINGW)
|
||||||
set(CMAKE_C_FLAGS "-mno-ms-bitfields -fexec-charset=cp850 ${CMAKE_C_FLAGS}")
|
set(CMAKE_C_FLAGS "-mno-ms-bitfields -fexec-charset=cp850 ${CMAKE_C_FLAGS}")
|
||||||
set(CMAKE_CXX_FLAGS "-mno-ms-bitfields -fexec-charset=cp850 ${CMAKE_CXX_FLAGS}")
|
set(CMAKE_CXX_FLAGS "-mno-ms-bitfields -fexec-charset=cp850 ${CMAKE_CXX_FLAGS}")
|
||||||
|
|
||||||
|
# link Winsock2
|
||||||
|
set(ADDITIONAL_LNK ws2_32 ${ADDITIONAL_LNK})
|
||||||
endif (MINGW)
|
endif (MINGW)
|
||||||
|
|
||||||
# GCC 10 has issues with false positives on stringop-overflow,
|
# GCC 10 has issues with false positives on stringop-overflow,
|
||||||
|
|
Loading…
Reference in a new issue