Merge Alex Lian branch

utils/CMakeLists.txt

@@ -17,6 +17,15 @@ TARGET_LINK_LIBRARIES(nfcutils nfc)
 FOREACH(source ${UTILS-SOURCES})
   SET (TARGETS ${source}.c)
 
+  IF(WIN32)
+    SET(RC_COMMENT "${PACKAGE_NAME} utility")
+    SET(RC_INTERNAL_NAME ${source})
+    SET(RC_ORIGINAL_NAME ${source}.exe)
+    SET(RC_FILE_TYPE VFT_APP)
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../windows/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/../windows/${source}.rc @ONLY)
+    LIST(APPEND TARGETS ${CMAKE_CURRENT_BINARY_DIR}/../windows/${source}.rc)
+  ENDIF(WIN32)
+
   IF((${source} MATCHES "nfc-mfultralight") OR (${source} MATCHES "nfc-mfclassic"))
     LIST(APPEND TARGETS mifare)
   ENDIF((${source} MATCHES "nfc-mfultralight") OR (${source} MATCHES "nfc-mfclassic"))
@@ -33,7 +42,6 @@ FOREACH(source ${UTILS-SOURCES})
   TARGET_LINK_LIBRARIES(${source} nfc)
   TARGET_LINK_LIBRARIES(${source} nfcutils)
 
-
   INSTALL(TARGETS ${source} RUNTIME DESTINATION bin COMPONENT utils)
 ENDFOREACH(source)
 

utils/nfc-read-forum-tag3.c

@@ -55,6 +55,10 @@
 
 #include "nfc-utils.h"
 
+#if defined(WIN32) && defined(__GNUC__) /* mingw compiler */
+ #include <getopt.h>
+#endif
+
 static nfc_device *pnd;
 
 static void