From b73d9f03fa09c6dc4a51cfd01b378488ba994540 Mon Sep 17 00:00:00 2001 From: Romuald Conty Date: Tue, 8 Sep 2009 08:17:37 +0000 Subject: [PATCH] CMake: reenable the broken tools in Windows. Add some more exports to bitutils to make compilation succeed. (Thanks to Fkooman) --- src/CMakeLists.txt | 7 +------ src/bitutils.h | 8 ++++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 079f871..6b382e0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,10 +1,5 @@ SET(LIBRARY-SOURCES libnfc dev_pn531 dev_pn533 rs232 bitutils dev_arygon) -SET(TOOLS-SOURCES list mftool mfultool initiator target) - -# disabled for now on Windows, due to lacking getopt -IF(NOT MSVC) - SET(TOOLS-SOURCES ${TOOLS-SOURCES} anticol emulate relay) -ENDIF(NOT MSVC) +SET(TOOLS-SOURCES list mftool mfultool initiator target anticol emulate relay) IF(LIBNFC_PCSC) ADD_DEFINITIONS("-DHAVE_PCSC_LITE=1") diff --git a/src/bitutils.h b/src/bitutils.h index ebbc865..24bdc47 100644 --- a/src/bitutils.h +++ b/src/bitutils.h @@ -34,13 +34,13 @@ uint64_t mirror64(uint64_t ui64Bits); void mirror_byte_ts(byte_t *pbts, uint32_t uiLen); LIBNFC_EXPORT uint32_t swap_endian32(const void* pui32); -uint64_t swap_endian64(const void* pui64); +LIBNFC_EXPORT uint64_t swap_endian64(const void* pui64); -void append_iso14443a_crc(byte_t* pbtData, uint32_t uiLen); +LIBNFC_EXPORT void append_iso14443a_crc(byte_t* pbtData, uint32_t uiLen); LIBNFC_EXPORT void print_hex(const byte_t* pbtData, const uint32_t uiLen); -void print_hex_bits(const byte_t* pbtData, const uint32_t uiBits); -void print_hex_par(const byte_t* pbtData, const uint32_t uiBits, const byte_t* pbtDataPar); +LIBNFC_EXPORT void print_hex_bits(const byte_t* pbtData, const uint32_t uiBits); +LIBNFC_EXPORT void print_hex_par(const byte_t* pbtData, const uint32_t uiBits, const byte_t* pbtDataPar); #endif // _LIBNFC_BITUTILS_H_