Support building irpmonc with MinGW

Makefile

@@ -0,0 +1,27 @@
+
+depdirs = \
+    libcallbackstreamdll \
+    libdparserdll \
+    libreqlistdll \
+    libsymbolsdll \
+    irpmondll \
+    libserver
+
+maindirs = irpmonc irpmon-server
+
+otherdirs = device-connector shared
+
+.PHONY: all clean $(depdirs) $(maindirs) $(otherdirs)
+
+all: $(otherdirs) $(maindirs)
+
+$(maindirs): $(depdirs)
+	$(MAKE) -C $@
+
+$(depdirs) $(otherdirs):
+	$(MAKE) -C $@
+
+libserver: device-connector
+
+clean:
+	$(foreach dir,$(depdirs) $(maindirs) $(otherdirs),$(MAKE) -C $(dir) $@ &&) :

common.mk

@@ -0,0 +1,20 @@
+
+# for cross-building with MinGW
+CROSS = x86_64-w64-mingw32-
+INCLUDES = -I/usr/share/mingw-w64/include
+
+INCLUDES += -I../include -I../shared
+CPPFLAGS += $(INCLUDES) -O2
+CFLAGS += $(INCLUDES) -O2
+
+CC = $(CROSS)gcc
+LD = $(CROSS)ld
+CXX = $(CROSS)g++
+
+all: $(EXE)
+
+$(EXE): $(OBJS)
+	$(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS)
+
+clean:
+	rm -f $(EXE) $(OBJS) $(DELOBJS)

device-connector/Makefile

@@ -0,0 +1,7 @@
+
+LDFLAGS += -shared
+
+EXE = device-connector.dll
+OBJS = device-connector.o
+
+include ../common.mk

irpmon-server/Makefile

@@ -0,0 +1,9 @@
+
+LDFLAGS += -L../libserver -mconsole
+LDLIBS += -lserver
+
+EXE = server
+OBJS = server.o
+DELOBJS = $(EXE).exe
+
+include ../common.mk

irpmonc/Makefile

@@ -0,0 +1,16 @@
+
+CPPFLAGS += -DNOVSOCKETS
+
+LDFLAGS += -municode \
+   -L../irpmondll -L../libdparserdll -L../libreqlistdll \
+   -L../libsymbolsdll -L../libcallbackstreamdll
+
+LDLIBS += \
+   -lirpmondll -llibdparser -llibreqlist \
+   -llibsymbols -lcallbackstream
+
+EXE = irpmonc
+OBJS = driver-settings.o irpmonc.o guid-api.o stop-event.o
+DELOBJS = $(EXE).exe
+
+include ../common.mk

irpmondll/Makefile

@@ -0,0 +1,7 @@
+
+LDFLAGS += -shared
+
+EXE = irpmondll.dll
+OBJS = driver-com.o main.o
+
+include ../common.mk

libcallbackstreamdll/Makefile

@@ -0,0 +1,7 @@
+
+LDFLAGS += -shared
+
+EXE = libcallbackstream.dll
+OBJS = callback-stream.o
+
+include ../common.mk

libdparserdll/Makefile

@@ -0,0 +1,7 @@
+
+LDFLAGS += -shared
+
+EXE = libdparser.dll
+OBJS = dparser.o
+
+include ../common.mk

libreqlistdll/Makefile

@@ -0,0 +1,7 @@
+
+LDFLAGS += -shared
+
+EXE = libreqlist.dll
+OBJS = reqlist.o
+
+include ../common.mk

libserver/Makefile

@@ -0,0 +1,9 @@
+
+CFLAGS += -DNOVSOCKETS -D_WIN32_WINNT=0x0600
+LDFLAGS += -shared -L../device-connector
+LDLIBS += -ldevice-connector -lws2_32
+
+EXE = libserver.dll
+OBJS = libserver.o
+
+include ../common.mk

libserver/libserver.c

@@ -1,11 +1,15 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <winsock2.h>
+#include <mswsock.h>
 #include <ws2tcpip.h>
 #include <windows.h>
 #include <winsvc.h>
+#ifndef NOVSOCKETS
 #include "libvsock.h"
+#endif
 #include "irpmondll-types.h"
 #include "network-connector.h"
 #include "device-connector.h"
@@ -258,8 +262,11 @@ DWORD IRPMonServerStart(const char *Address, const char *Port, HANDLE ExitEvent)
 		goto Exit;
 	}
 
+#ifndef NOVSOCKETS
 	useVSockets = strcmp(Address, "vsock") == 0;
+#endif
 	if (useVSockets) {
+#ifndef NOVSOCKETS
 		ADDRINFOA localAddrs;
 		struct sockaddr *a = NULL;
 		int aLen = 0;
@@ -282,6 +289,7 @@ DWORD IRPMonServerStart(const char *Address, const char *Port, HANDLE ExitEvent)
 		addrs->ai_addrlen = aLen;
 		addrs->ai_family = LibVSockGetAddressFamily();
 		addrs->ai_socktype = SOCK_STREAM;
+#endif
 	} else {
 		memset(&hints, 0, sizeof(hints));
 		hints.ai_family = AF_UNSPEC;
@@ -295,9 +303,13 @@ DWORD IRPMonServerStart(const char *Address, const char *Port, HANDLE ExitEvent)
 	}
 
 	ret = _Listener(addrs, ExitEvent);
+#ifndef NOVSOCKETS
 	if (useVSockets)
 		LibVSockAddressFree(addrs->ai_addr);
 	else freeaddrinfo(addrs);
+#else
+	freeaddrinfo(addrs);
+#endif
 Cleanup:
 	WSACleanup();
 Exit:

libsymbolsdll/Makefile

@@ -0,0 +1,7 @@
+
+LDFLAGS += -shared
+
+EXE = libsymbols.dll
+OBJS = symbols.o
+
+include ../common.mk

libvsock/Makefile

@@ -0,0 +1,7 @@
+
+LDFLAGS += -shared
+
+EXE = libvsock.dll
+OBJS = libvsock.o
+
+include ../common.mk

shared/Makefile

@@ -0,0 +1,7 @@
+
+LDFLAGS += -shared
+
+EXE = request.dll
+OBJS = request.o
+
+include ../common.mk