MinGW: Second step of porting to MinGW

utils/Makefile.am

@@ -1,8 +1,9 @@
-AM_CPPFLAGS = -I${srcdir}/../include
+AM_CPPFLAGS = -I${srcdir}/../include -I${srcdir}/../win32
 AM_CFLAGS = $(WARN_CFLAGS)
 AM_LDFLAGS = -no-undefined
 LIBS = ../lib/libiscsi.la
 
-bin_PROGRAMS = iscsi-inq iscsi-ls iscsi-perf iscsi-readcapacity16 \
-	iscsi-swp
-
+bin_PROGRAMS = iscsi-inq iscsi-ls iscsi-swp
+if !TARGET_OS_IS_WIN32
+bin_PROGRAMS += iscsi-perf iscsi-readcapacity16
+endif

utils/iscsi-ls.c

@@ -21,7 +21,9 @@
 #if defined(_WIN32)
 #include <winsock2.h>
 #include "win32_compat.h"
+#ifdef _MSC_VER
 #pragma comment(lib, "ws2_32.lib")
+#endif
 WSADATA wsaData;
 #endif