From c3df3a12aa88739e303340ccd7436d467b4662d2 Mon Sep 17 00:00:00 2001
From: Toni Uhlig <matzeton@googlemail.com>
Date: Wed, 16 Mar 2022 11:03:57 +0100
Subject: Fixed msys2 build warnings and re-activated CI Mingw64 build.

 * Removed Visual Studio leftovers. Maintaining an autotools project with VS integration requires some additional overhead.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Signed-off-by: lns <matzeton@googlemail.com>
---
 tests/unit/Makefile.in | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

(limited to 'tests/unit/Makefile.in')

diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in
index b2f779fd3..e1d13328e 100644
--- a/tests/unit/Makefile.in
+++ b/tests/unit/Makefile.in
@@ -1,10 +1,14 @@
 CC=@CC@
 CXX=@CXX@
 BUILD_MINGW=@BUILD_MINGW@
+EXE_SUFFIX=@EXE_SUFFIX@
 
 SRCHOME=../../src
 
-CFLAGS=-g -fPIC -DPIC -I$(SRCHOME)/include @JSONC_CFLAGS@ @PCAP_INC@ @CFLAGS@
+ifneq ($(OS),Windows_NT)
+CFLAGS+=-fPIC -DPIC
+endif
+CFLAGS+=-g -I$(SRCHOME)/include @JSONC_CFLAGS@ @PCAP_INC@ @CFLAGS@
 LIBNDPI=$(SRCHOME)/lib/libndpi.a
 LIBS=$(LIBNDPI) @PCAP_LIB@ @LIBS@ @ADDITIONAL_LIBS@ @JSONC_LIBS@ -lpthread
 LDFLAGS=@LDFLAGS@
@@ -13,24 +17,41 @@ OBJS=unit
 PREFIX?=@prefix@
 
 ifneq ($(BUILD_MINGW),)
-all:
-	@echo 'Unit tests disabled due to mingw build.'
 
+ifeq ($(DISABLE_NPCAP),0)
+CFLAGS+=-I@srcdir@/../windows/WpdPack/Include -I@srcdir@/../windows/WpdPack/Include/pcap
 else
+CFLAGS+=-DDISABLE_NPCAP
+endif
 
-all: unit
+ifeq ($(DISABLE_NPCAP),0)
+
+ifneq ($(BUILD_MINGW_X64),)
+LIBS+=@srcdir@/../windows/WpdPack/Lib/x64/wpcap.lib
+else
+LIBS+=@srcdir@/../windows/WpdPack/Lib/wpcap.lib
+endif
+
+endif
+
+LIBS+=-Wl,-Bstatic -lpthread -Wl,-Bdynamic
+else
+LIBS+=-pthread
+endif
+
+all: unit$(EXE_SUFFIX)
 
 EXECUTABLE_SOURCES := unit.c
 COMMON_SOURCES := $(filter-out $(EXECUTABLE_SOURCES),$(wildcard *.c ))
 
-unit: $(LIBNDPI) unit.o
+unit$(EXE_SUFFIX): $(LIBNDPI) unit.o
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) unit.o $(LIBS) -o $@
 
 %.o: %.c $(HEADERS) Makefile
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
 clean:
-	/bin/rm -f *.o unit
+	/bin/rm -f *.o unit$(EXE_SUFFIX)
 	/bin/rm -f .*.o.cmd .*.o.d
 	/bin/rm -rf build
 
@@ -42,5 +63,3 @@ distdir:
 
 distclean: clean
 	/bin/rm -f Makefile
-
-endif
-- 
cgit v1.2.3