MERGE: libnfc-mingw-cross merge with trunk (r805-821)

examples/CMakeLists.txt

@@ -20,8 +20,8 @@ ENDFOREACH(source)
 TARGET_LINK_LIBRARIES(nfc-mfclassic mifare)
 TARGET_LINK_LIBRARIES(nfc-mfultralight mifare)
 
-IF(NOT MSVC)
+IF(NOT WIN32)
   # Manuals for the examples
   FILE(GLOB manuals "${CMAKE_CURRENT_SOURCE_DIR}/*.1")
   INSTALL(FILES ${manuals} DESTINATION ${SHARE_INSTALL_PREFIX}/man/man1 COMPONENT manuals)
-ENDIF(NOT MSVC)
+ENDIF(NOT WIN32)

examples/Makefile.am

@@ -12,8 +12,12 @@ bin_PROGRAMS = \
 		nfc-relay \
 		nfc-relay-picc \
 		pn53x-diagnose \
-		pn53x-sam \
+		pn53x-sam
+
+if POSIX_ONLY_EXAMPLES_ENABLED
+bin_PROGRAMS += \
 		pn53x-tamashell
+endif
 
 # set the include path found by configure
 INCLUDES= $(all_includes) $(LIBNFC_CFLAGS)

examples/nfc-relay-picc.c

@@ -51,6 +51,7 @@
 #  define SUSP_TIME 1           // secs.
 #else
 // Needed by Sleep() under Windows
+#  include "../contrib/windows.h"
 #  include <winbase.h>
 #  define sleep Sleep
 #  define SUSP_TIME 1000        // msecs.

examples/pn53x-sam.c

@@ -37,6 +37,7 @@
 #  define SUSP_TIME 1           // secs.
 #else
 // Needed by Sleep() under Windows
+#  include "../contrib/windows.h"
 #  include <winbase.h>
 #  define sleep Sleep
 #  define SUSP_TIME 1000        // msecs.