summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author Patrick Mackinlay <pmackinlay@hotmail.com>2018-07-30 15:52:11 +0700
committer Vas Crabb <cuavas@users.noreply.github.com>2018-07-30 18:52:11 +1000
commit7957feaefca16cffe92369f94ca44bd8d6ec1a07 (patch)
tree569360eea6f9010d3b8304b7917c784bc04a8360 /scripts/src
parentecc609e22dc39fe1c2c116828b34f796cee4639c (diff)
taptun: add support for Windows (#3790)
* taptun: add support for Windows Looking for feedback only at this point, because it's the first time I've attempted any OSD stuff - be gentle. This extends the existing taptun OSD module to support Windows through the TAP-Windows6 driver (https://github.com/OpenVPN/tap-windows6). * TAP-Windows6 is GPLv2, however only the header file is required in MAME, and the driver itself is entirely optional. * I've tried to minimise the size of the diff, rather than completely separate the Windows/non-Windows implementations - not sure which is preferable in this case. * The license file has Mac(?) line-endings - unsure if they should be normalized or used verbatim. * Uncertain about the non-Windows case (or the Windows SDL case) - existing code uses __linux__, but I'm not clear on how that works with OSX, for example? * I can't claim this actually "works" yet, because I don't know enough to configure the tap end of it properly to get networking doing something useful, but I will get there and correct anything necessary in a subsequent real PR. * minor fixes/improvements (nw) * Use Unicode Windows APIs, and UTF-8 for MAME * Deal with unterminated registry string values * Cancel any pending I/O in destructor
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/osd/windows_cfg.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua
index 73598da6760..2735e4df4f0 100644
--- a/scripts/src/osd/windows_cfg.lua
+++ b/scripts/src/osd/windows_cfg.lua
@@ -41,6 +41,7 @@ if not _OPTIONS["DONT_USE_NETWORK"] then
defines {
"USE_NETWORK",
"OSD_NET_USE_PCAP",
+ "OSD_NET_USE_TAPTUN",
}
end