From 5e452dbb1328cce60ea7e9ff2bd4c292d64ce4a2 Mon Sep 17 00:00:00 2001 From: Romain Tartiere Date: Fri, 16 Apr 2010 17:10:08 +0000 Subject: [PATCH 1/3] Fix cmake breakage introduced in r352: error: 'for' loop initial declaration used outside C99 mode --- libnfc/nfc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libnfc/nfc.c b/libnfc/nfc.c index c5ac543..debb4ab 100644 --- a/libnfc/nfc.c +++ b/libnfc/nfc.c @@ -596,12 +596,13 @@ nfc_initiator_poll_targets(const nfc_device_t* pnd, } // byte_t abtInAutoPoll[] = { 0xd4, 0x60, 0x0f, 0x01, 0x00 }; size_t szTxInAutoPoll = 4 + szTargetTypes; + size_t n; byte_t *pbtTxInAutoPoll = malloc( szTxInAutoPoll ); pbtTxInAutoPoll[0] = 0xd4; pbtTxInAutoPoll[1] = 0x60; pbtTxInAutoPoll[2] = btPollNr; pbtTxInAutoPoll[3] = btPeriod; - for(size_t n=0; n Date: Fri, 16 Apr 2010 17:20:22 +0000 Subject: [PATCH 2/3] Fix cmake breakage introduced in r360: undefined reference to `print_nfc_iso14443a_info' --- examples/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 2d1bda3..722d02c 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -6,10 +6,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libnfc) INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIRS} ${PCSC_INCLUDE_DIRS}) LINK_DIRECTORIES(${LIBUSB_LIBRARY_DIRS} ${PCSC_LIBRARY_DIRS}) +ADD_LIBRARY(nfc-utils nfc-utils) + # Examples FOREACH(source ${EXAMPLES-SOURCES}) ADD_EXECUTABLE(${source} ${source}.c) TARGET_LINK_LIBRARIES(${source} nfc) + TARGET_LINK_LIBRARIES(${source} nfc-utils) INSTALL(TARGETS ${source} RUNTIME DESTINATION bin COMPONENT examples) ENDFOREACH(source) From 3dccc218df13916a5e60150d32e724a57fe8f79a Mon Sep 17 00:00:00 2001 From: Romain Tartiere Date: Fri, 16 Apr 2010 17:35:00 +0000 Subject: [PATCH 3/3] Enable drivers in cmake again (disabled implicitly in r375). --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3279fed..0daee7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,6 +84,12 @@ IF(NOT MSVC) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libnfc.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ENDIF(NOT MSVC) +ADD_DEFINITIONS(-DDRIVER_ACR122_ENABLED) +ADD_DEFINITIONS(-DDRIVER_PN531_USB_ENABLED) +ADD_DEFINITIONS(-DDRIVER_PN533_USB_ENABLED) +ADD_DEFINITIONS(-DDRIVER_ARYGON_ENABLED) +#ADD_DEFINITIONS(-DDRIVER_PN532_UART_ENABLED) + ADD_SUBDIRECTORY(libnfc) ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(examples)