Merge the libnfc-less-bitutils-more-ponies branch into trunk.
This commit is contained in:
commit
b28abd77b0
23 changed files with 330 additions and 65 deletions
|
|
@ -83,6 +83,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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue