summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/osd/windows_cfg.lua
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-03-05 21:23:21 +1100
committer Vas Crabb <vas@vastheman.com>2020-03-05 21:23:21 +1100
commit5bce46bd7561ae1857c7e17614133f01f984ae78 (patch)
tree5df802bbf88b78604f359e9691f395fd2fea4bec /scripts/src/osd/windows_cfg.lua
parent72082dc6d70b62ad921d5ac680c628c9ce158271 (diff)
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.
Diffstat (limited to 'scripts/src/osd/windows_cfg.lua')
-rw-r--r--scripts/src/osd/windows_cfg.lua14
1 files changed, 11 insertions, 3 deletions
diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua
index 2735e4df4f0..10e5ee86a21 100644
--- a/scripts/src/osd/windows_cfg.lua
+++ b/scripts/src/osd/windows_cfg.lua
@@ -37,12 +37,20 @@ else
}
end
-if not _OPTIONS["DONT_USE_NETWORK"] then
+if _OPTIONS["USE_TAPTUN"]=="1" or _OPTIONS["USE_PCAP"]==1 then
defines {
"USE_NETWORK",
- "OSD_NET_USE_PCAP",
- "OSD_NET_USE_TAPTUN",
}
+ if _OPTIONS["USE_TAPTUN"]=="1" then
+ defines {
+ "OSD_NET_USE_TAPTUN",
+ }
+ end
+ if _OPTIONS["USE_PCAP"]=="1" then
+ defines {
+ "OSD_NET_USE_PCAP",
+ }
+ end
end
if _OPTIONS["USE_SDL"]=="1" then