crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'msvc2' into msvc

Browse source
This commit is contained in:
Unknown 2020-07-08 13:38:46 +02:00
commit e37d24e691
8 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -7,6 +7,8 @@
*.lo
*.o
*~
.vs/
CMakeSettings.json
Doxyfile
INSTALL
aclocal.m4
@ -60,7 +62,3 @@ utils/nfc-mfultralight
utils/nfc-read-forum-tag3
utils/nfc-relay-picc
utils/nfc-scan-device
.vs/
CMakeSettings.json

19
.travis.yml
View file

@ -22,6 +22,18 @@ matrix:
- libusb-dev
- doxygen
- cmake
script:
- mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=~/.local .. && make -j2 && make install
- os: linux
dist: bionic
compiler:
- clang
addons:
apt:
packages:
- libusb-dev
- doxygen
script:
- autoreconf -vfi && mkdir build && cd build && ../configure --prefix=$HOME/.local/ && make -j2 && make install
@ -47,7 +59,6 @@ matrix:
packages:
- libusb-dev
- doxygen
- cmake
script:
- autoreconf -vfi && mkdir build && cd build && ../configure --prefix=$HOME/.local/ && make -j2 && make install
@ -56,8 +67,7 @@ matrix:
compiler:
- clang
before_install:
- brew update
- brew install autoconf automake cmake doxygen gettext libusb libusb-compat m4 pcre2 pkg-config
- brew install doxygen libusb-compat
script:
- mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=~/.local .. && make -j2 && make install
@ -66,7 +76,6 @@ matrix:
compiler:
- clang
before_install:
- brew update
- brew install autoconf automake doxygen gettext libusb libusb-compat m4 pcre2 pkg-config
- brew install doxygen libusb-compat m4
script:
- autoreconf -vfi && mkdir build && cd build && ../configure --prefix=$HOME/.local/ && make -j2 && make install

10
cmake/modules/LibnfcDrivers.cmake
View file

@ -3,13 +3,13 @@ SET(LIBNFC_DRIVER_ACR122_PCSC OFF CACHE BOOL "Enable ACR122 support (Depends on
SET(LIBNFC_DRIVER_ACR122_USB ON CACHE BOOL "Enable ACR122 support (Direct USB connection)")
SET(LIBNFC_DRIVER_ACR122S ON CACHE BOOL "Enable ACR122S support (Use serial port)")
SET(LIBNFC_DRIVER_ARYGON ON CACHE BOOL "Enable ARYGON support (Use serial port)")
IF(NOT UNIX OR APPLE)
SET(LIBNFC_DRIVER_PN532_I2C OFF CACHE BOOL "Enable PN532 I2C support (Use I2C bus)")
SET(LIBNFC_DRIVER_PN532_SPI OFF CACHE BOOL "Enable PN532 SPI support (Use SPI bus)")
ELSE(NOT UNIX OR APPLE)
IF(UNIX AND NOT APPLE)
SET(LIBNFC_DRIVER_PN532_I2C ON CACHE BOOL "Enable PN532 I2C support (Use I2C bus)")
SET(LIBNFC_DRIVER_PN532_SPI ON CACHE BOOL "Enable PN532 SPI support (Use SPI bus)")
ENDIF(NOT UNIX OR APPLE)
ELSE(UNIX AND NOT APPLE)
SET(LIBNFC_DRIVER_PN532_I2C OFF CACHE BOOL "Enable PN532 I2C support (Use I2C bus)")
SET(LIBNFC_DRIVER_PN532_SPI OFF CACHE BOOL "Enable PN532 SPI support (Use SPI bus)")
ENDIF(UNIX AND NOT APPLE)
SET(LIBNFC_DRIVER_PN532_UART ON CACHE BOOL "Enable PN532 UART support (Use serial port)")
SET(LIBNFC_DRIVER_PN53X_USB ON CACHE BOOL "Enable PN531 and PN531 USB support (Depends on libusb)")

2
contrib/win32/getopt.c
View file

@ -103,4 +103,4 @@ int getopt(int nargc, char * const nargv[], const char *ostr)
++optind;
}
return (optopt); /* dump back option letter */
}
}

2
contrib/win32/getopt.h
View file

@ -10,4 +10,4 @@ extern char *optarg; /* argument associated with option */
int getopt(int nargc, char * const nargv[], const char *ostr);
#endif
#endif

2
contrib/win32/nfc.def
View file

@ -54,4 +54,4 @@ EXPORTS
pn53x_transceive
pn532_SAMConfiguration
pn53x_read_register
pn53x_write_register
pn53x_write_register

2
contrib/win32/nfc_msvc.def
View file

@ -54,4 +54,4 @@ EXPORTS
pn53x_transceive
pn532_SAMConfiguration
pn53x_read_register
pn53x_write_register
pn53x_write_register

16
libnfc/CMakeLists.txt
View file

@ -29,23 +29,23 @@ IF(UART_REQUIRED)
ENDIF(UART_REQUIRED)
IF(I2C_REQUIRED)
IF(NOT UNIX OR APPLE)
IF(UNIX AND NOT APPLE)
LIST(APPEND BUSES_SOURCES buses/i2c)
ELSE(UNIX AND NOT APPLE)
# Only Linux is supported at the moment
#LIST(APPEND BUSES_SOURCES ../contrib/win32/libnfc/buses/i2c)
MESSAGE( FATAL_ERROR "I2C is only (yet) supported in Linux!" )
ELSE(NOT UNIX OR APPLE)
LIST(APPEND BUSES_SOURCES buses/i2c)
ENDIF(NOT UNIX OR APPLE)
ENDIF(UNIX AND NOT APPLE)
ENDIF(I2C_REQUIRED)
IF(SPI_REQUIRED)
IF(NOT UNIX OR APPLE)
IF(UNIX AND NOT APPLE)
LIST(APPEND BUSES_SOURCES buses/spi)
ELSE(UNIX AND NOT APPLE)
# Only Linux is supported at the moment
#LIST(APPEND BUSES_SOURCES ../contrib/win32/libnfc/buses/spi)
MESSAGE( FATAL_ERROR "SPI is only (yet) supported in Linux!" )
ELSE(NOT UNIX OR APPLE)
LIST(APPEND BUSES_SOURCES buses/spi)
ENDIF(NOT UNIX OR APPLE)
ENDIF(UNIX AND NOT APPLE)
ENDIF(SPI_REQUIRED)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/buses)