Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-24 15:39:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix PCSC compilation under windows

Browse Source 
PR3843 based on release-v0.12 => rebased on master
This commit is contained in:
cslashm 2018-05-23 10:22:55 +02:00
parent a2cef8cba4
commit bdf5a3ad3f
4 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -452,9 +452,12 @@ link_directories(${LIBUNWIND_LIBRARY_DIRS})
# Final setup for libpcsc # Final setup for libpcsc
if (PCSC_FOUND) if (PCSC_FOUND)
message(STATUS "Using PCSC include dir at ${PCSC_INCLUDE_DIR}")
add_definitions(-DHAVE_PCSC) add_definitions(-DHAVE_PCSC)
include_directories(${PCSC_INCLUDE_DIR}) include_directories(${PCSC_INCLUDE_DIR})
link_directories(${LIBPCSC_LIBRARY_DIRS}) link_directories(${LIBPCSC_LIBRARY_DIRS})
else (PCSC_FOUND)
message(STATUS "Could not find PCSC")
endif() endif()
if(MSVC) if(MSVC)

6
cmake/FindPCSC.cmake
View File

@ -18,6 +18,9 @@ ENDIF (NOT WIN32)
FIND_PATH(PCSC_INCLUDE_DIR winscard.h FIND_PATH(PCSC_INCLUDE_DIR winscard.h
HINTS HINTS
IF (WIN32)
${MSYS2_FOLDER}/mingw64/x86_64-w64-mingw32/include
ENDIF (WIN32)
/usr/include/PCSC /usr/include/PCSC
${PC_PCSC_INCLUDEDIR} ${PC_PCSC_INCLUDEDIR}
${PC_PCSC_INCLUDE_DIRS} ${PC_PCSC_INCLUDE_DIRS}
@ -26,6 +29,9 @@ FIND_PATH(PCSC_INCLUDE_DIR winscard.h
FIND_LIBRARY(PCSC_LIBRARY NAMES pcsclite libpcsclite WinSCard PCSC FIND_LIBRARY(PCSC_LIBRARY NAMES pcsclite libpcsclite WinSCard PCSC
HINTS HINTS
IF (WIN32)
${MSYS2_FOLDER}/mingw64/x86_64-w64-mingw32/lib
ENDIF (WIN32)
${PC_PCSC_LIBDIR} ${PC_PCSC_LIBDIR}
${PC_PCSC_LIBRARY_DIRS} ${PC_PCSC_LIBRARY_DIRS}
) )

9
src/device/device_ledger.cpp
View File

@ -48,6 +48,15 @@ namespace hw {
/* ===================================================================== */ /* ===================================================================== */
/* === Debug ==== */ /* === Debug ==== */
/* ===================================================================== */ /* ===================================================================== */
#ifdef WIN32
static char *pcsc_stringify_error(LONG rv) {
static __thread char out[20];
sprintf_s(out, sizeof(out), "0x%08lX", rv);
return out;
}
#endif
void set_apdu_verbose(bool verbose) { void set_apdu_verbose(bool verbose) {
apdu_verbose = verbose; apdu_verbose = verbose;
} }

5
src/device/device_ledger.hpp
View File

@ -33,8 +33,13 @@
#include <cstddef> #include <cstddef>
#include <string> #include <string>
#include "device.hpp" #include "device.hpp"
#ifdef WIN32
#include <winscard.h>
#define MAX_ATR_SIZE 33
#else
#include <PCSC/winscard.h> #include <PCSC/winscard.h>
#include <PCSC/wintypes.h> #include <PCSC/wintypes.h>
#endif
#include <boost/thread/mutex.hpp> #include <boost/thread/mutex.hpp>
#include <boost/thread/recursive_mutex.hpp> #include <boost/thread/recursive_mutex.hpp>