some cleanings

nfc-tools · Jul 7, 2020 · 7ad18a2 · 7ad18a2
1 parent e21fab3
commit 7ad18a2
Show file tree

Hide file tree

Showing 16 changed files with 135 additions and 342 deletions.
diff --git a/.gitignore b/.gitignore
@@ -60,3 +60,7 @@ utils/nfc-mfultralight
 utils/nfc-read-forum-tag3
 utils/nfc-relay-picc
 utils/nfc-scan-device
+
+.vs/
+
+CMakeSettings.json
diff --git a/.travis.yml b/.travis.yml
@@ -1,20 +1,72 @@
 language: c
 
-compiler:
- - clang
- - gcc
+matrix:
+ include:
+ - os: windows
+ compiler:
+ - clang
+ before_install:
+ - mkdir build && cd build && wget "https://sourceforge.net/projects/libusb-win32/files/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip" && 7z x libusb-win32-bin-1.2.6.0.zip -o"$PROGRAMFILES" && mv "$PROGRAMFILES/libusb-win32-bin-1.2.6.0" "$PROGRAMFILES/libusb-win32"
+ install:
+ choco install doxygen.install ninja
+ script:
+ cmake -GNinja .. && cmake --build .
 
-env:
- - BLD=cmake
- - BLD=autoconf
+ - os: linux
+ dist: bionic
+ compiler:
+ - clang
+ addons:
+ apt:
+ packages:
+ - libusb-dev
+ - doxygen
+ - cmake
+ script:
+ - autoreconf -vfi && mkdir build && cd build && ../configure --prefix=$HOME/.local/ && make -j2 && make install
 
-addons:
- apt:
- packages:
- - libusb-dev
- - doxygen
- - cmake
+ - os: linux
+ dist: bionic
+ compiler:
+ - gcc
+ addons:
+ apt:
+ packages:
+ - libusb-dev
+ - doxygen
+ - cmake
+ script:
+ - mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=~/.local .. && make -j2 && make install
 
-script:
- - if [ $BLD == autoconf ]; then autoreconf -vfi && mkdir build && cd build && ../configure --prefix=$HOME/.local/ && make -j2 && make install; fi
- - if [ $BLD == cmake ]; then mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=~/.local .. && make -j2 && make install; fi
+ - os: linux
+ dist: bionic
+ compiler:
+ - gcc
+ addons:
+ apt:
+ packages:
+ - libusb-dev
+ - doxygen
+ - cmake
+ script:
+ - autoreconf -vfi && mkdir build && cd build && ../configure --prefix=$HOME/.local/ && make -j2 && make install
+
+ - os: osx
+ osx_image: xcode12
+ compiler:
+ - clang
+ before_install:
+ - brew update
+ - brew install autoconf automake cmake doxygen gettext libusb libusb-compat m4 pcre2 pkg-config
+ script:
+ - mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=~/.local .. && make -j2 && make install
+
+ - os: osx
+ osx_image: xcode12
+ compiler:
+ - clang
+ before_install:
+ - brew update
+ - brew install autoconf automake doxygen gettext libusb libusb-compat m4 pcre2 pkg-config
+ script:
+ - autoreconf -vfi && mkdir build && cd build && ../configure --prefix=$HOME/.local/ && make -j2 && make install
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,9 +18,12 @@ SET(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 
 # config.h
 IF(WIN32)
+ SET(LIBNFC_SYSCONFDIR "./config" CACHE PATH "libnfc configuration directory")
  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config_windows.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
- SET(LIBNFC_SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/config" CACHE PATH "libnfc configuration directory")
  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/contrib/win32)
+ IF(NOT MINGW)
+ SET(CMAKE_C_FLAGS "-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE ${CMAKE_C_FLAGS}")
+ ENDIF(NOT MINGW)
 ELSE(WIN32)
  SET(_XOPEN_SOURCE 600)
  SET(SYSCONFDIR "/etc" CACHE PATH "System configuration directory")
@@ -138,9 +141,12 @@ IF(NOT WIN32)
  IF(LIBNFC_DRIVER_PN53X_USB)
  SET(PKG_REQ ${PKG_REQ} "libusb")
  ENDIF(LIBNFC_DRIVER_PN53X_USB)
+ IF(LIBNFC_DRIVER_ACR122_USB)
+ SET(PKG_REQ ${PKG_REQ} "libusb")
+ ENDIF(LIBNFC_DRIVER_ACR122_USB)
  IF(LIBNFC_DRIVER_PCSC)
  SET(PKG_REQ ${PKG_REQ} "libpcsclite")
- ENDIF(LIBNFC_DRIVER_ACR122)
+ ENDIF(LIBNFC_DRIVER_PCSC)
  IF(LIBNFC_DRIVER_ACR122_PCSC)
  SET(PKG_REQ ${PKG_REQ} "libpcsclite")
  ENDIF(LIBNFC_DRIVER_ACR122_PCSC)
@@ -201,7 +207,7 @@ IF(WIN32)
  SET(RC_COMMENT "${PACKAGE_NAME} library")
  SET(RC_INTERNAL_NAME "${PACKAGE_NAME} ${WIN32_MODE}")
  SET(RC_ORIGINAL_NAME ${PACKAGE_NAME}.dll)
- SET(RC_FILE_TYPE VFT_DLL)
+ SET(RC_FILE_TYPE 0x00000002L)
  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/contrib/win32/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/windows/libnfc.rc @ONLY)
 ENDIF(WIN32)
 

diff --git a/cmake/modules/FindLIBUSB.cmake b/cmake/modules/FindLIBUSB.cmake
@@ -26,9 +26,15 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES FreeBSD)
 
 IF(NOT LIBUSB_FOUND)
  IF(WIN32)
- FIND_PATH(LIBUSB_INCLUDE_DIRS lusb0_usb.h "$ENV{ProgramFiles}/LibUSB-Win32/include" NO_SYSTEM_ENVIRONMENT_PATH)
- FIND_LIBRARY(LIBUSB_LIBRARIES NAMES libusb PATHS "$ENV{ProgramFiles}/LibUSB-Win32/lib/gcc")
- SET(LIBUSB_LIBRARY_DIR "$ENV{ProgramFiles}/LibUSB-Win32/bin/x86/")
+ IF(MINGW)
+ FIND_PATH(LIBUSB_INCLUDE_DIRS lusb0_usb.h "${CMAKE_CURRENT_BINARY_DIR}/LibUSB-Win32/include" NO_SYSTEM_ENVIRONMENT_PATH)
+ FIND_LIBRARY(LIBUSB_LIBRARIES NAMES libusb PATHS "${CMAKE_CURRENT_BINARY_DIR}/LibUSB-Win32/lib/gcc")
+ SET(LIBUSB_LIBRARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/LibUSB-Win32/bin/x86/")
+ ELSE(MINGW)
+ FIND_PATH(LIBUSB_INCLUDE_DIRS lusb0_usb.h "$ENV{ProgramW6432}/libusb-win32/include" NO_SYSTEM_ENVIRONMENT_PATH)
+ FIND_LIBRARY(LIBUSB_LIBRARIES NAMES libusb PATHS "$ENV{ProgramW6432}/libusb-win32/lib/msvc_x64")
+ SET(LIBUSB_LIBRARY_DIR "$ENV{ProgramW6432}/libusb-win32/bin/amd64/")
+ ENDIF(MINGW)
  # Must fix up variable to avoid backslashes during packaging
  STRING(REGEX REPLACE "\\\\" "/" LIBUSB_LIBRARY_DIR ${LIBUSB_LIBRARY_DIR})
  ELSE(WIN32)

diff --git a/cmake/modules/LibnfcDrivers.cmake b/cmake/modules/LibnfcDrivers.cmake
@@ -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(WIN32)
+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(WIN32)
+ELSE(NOT UNIX OR 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(WIN32)
+ENDIF(NOT UNIX OR 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)")
 
@@ -68,4 +68,11 @@ IF(LIBNFC_DRIVER_PN53X_USB)
  SET(USB_REQUIRED TRUE)
 ENDIF(LIBNFC_DRIVER_PN53X_USB)
 
+IF(LIBNFC_DRIVER_ACR122_USB)
+ FIND_PACKAGE(LIBUSB REQUIRED)
+ ADD_DEFINITIONS("-DDRIVER_ACR122_USB_ENABLED")
+ SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/acr122_usb")
+ SET(USB_REQUIRED TRUE)
+ENDIF(LIBNFC_DRIVER_ACR122_USB)
+
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libnfc/drivers)