From 5bce46bd7561ae1857c7e17614133f01f984ae78 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 5 Mar 2020 21:23:21 +1100 Subject: Removed winpcap and cleaned up network module selection. (nw) The pcap.h header itself has the problematic original BSD license, including the obnoxious advertising clause. Using tap/tun networking on Windows provides a much better experience, so the extra setup is worth it. This patch also allows you to enable pcap on platforms where it's disabled by default with USE_PCAP=1 if you really want to use it. --- makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'makefile') diff --git a/makefile b/makefile index 679a818c4e1..4009e18e391 100644 --- a/makefile +++ b/makefile @@ -33,7 +33,8 @@ # SDL2_MULTIAPI = 1 # NO_USE_MIDI = 1 # NO_USE_PORTAUDIO = 1 -# DONT_USE_NETWORK = 1 +# USE_TAPTUN = 1 +# USE_PCAP = 1 # USE_QTDEBUG = 1 # NO_X11 = 1 # NO_USE_XINPUT = 1 @@ -713,6 +714,10 @@ ifdef DONT_USE_NETWORK PARAMS += --DONT_USE_NETWORK='$(DONT_USE_NETWORK)' endif +ifdef USE_PCAP +PARAMS += --USE_PCAP='$(USE_PCAP)' +endif + ifdef NO_OPENGL PARAMS += --NO_OPENGL='$(NO_OPENGL)' endif -- cgit v1.2.3-70-g09d2