| Previous | 199869 Revisions | Next |
| r36867 Wednesday 1st April, 2015 at 07:00:35 UTC by Vasantha Crabb |
|---|
| Link osdnet into a library reflecting its location, define USE_NETWORK properly, don't use SDL in non-SDL-specific macros |
| [scripts] | genie.lua |
| [scripts/src] | emu.lua |
| [scripts/src/osd] | modules.lua sdl_cfg.lua windows_cfg.lua |
| [src/osd/modules/netdev] | pcap.c taptun.c |
| r245378 | r245379 | |
|---|---|---|
| 390 | 390 | "LSB_FIRST", |
| 391 | 391 | } |
| 392 | 392 | |
| 393 | -- define USE_NETWORK if networking is enabled (not OS/2 and hasn't been disabled) | |
| 394 | if not _OPTIONS["targetos"]=="os2" then | |
| 395 | defines { | |
| 396 | "USE_NETWORK", | |
| 397 | } | |
| 398 | end | |
| 399 | 393 | -- need to ensure FLAC functions are statically linked |
| 400 | 394 | defines { |
| 401 | 395 | "FLAC__NO_DLL", |
| r245378 | r245379 | |
|---|---|---|
| 123 | 123 | MAME_DIR .. "src/emu/debug/textbuf.c", |
| 124 | 124 | MAME_DIR .. "src/emu/profiler.c", |
| 125 | 125 | MAME_DIR .. "src/emu/webengine.c", |
| 126 | MAME_DIR .. "src/osd/osdnet.c", | |
| 127 | 126 | MAME_DIR .. "src/emu/sound/filter.c", |
| 128 | 127 | MAME_DIR .. "src/emu/sound/flt_vol.c", |
| 129 | 128 | MAME_DIR .. "src/emu/sound/flt_rc.c", |
| r245378 | r245379 | |
|---|---|---|
| 9 | 9 | } |
| 10 | 10 | |
| 11 | 11 | files { |
| 12 | MAME_DIR .. "src/osd/osdnet.c", | |
| 12 | 13 | MAME_DIR .. "src/osd/modules/lib/osdobj_common.c", |
| 13 | 14 | MAME_DIR .. "src/osd/modules/debugger/none.c", |
| 14 | 15 | MAME_DIR .. "src/osd/modules/debugger/debugint.c", |
| r245378 | r245379 | |
|---|---|---|
| 4 | 4 | |
| 5 | 5 | if SDL_NETWORK~="" and not _OPTIONS["DONT_USE_NETWORK"] then |
| 6 | 6 | defines { |
| 7 | "SDLMAME_NET_" .. string.upper(SDL_NETWORK), | |
| 7 | "USE_NETWORK", | |
| 8 | "OSD_NET_USE_" .. string.upper(SDL_NETWORK), | |
| 8 | 9 | } |
| 9 | 10 | end |
| 10 | 11 |
| r245378 | r245379 | |
|---|---|---|
| 9 | 9 | |
| 10 | 10 | if not _OPTIONS["DONT_USE_NETWORK"] then |
| 11 | 11 | defines { |
| 12 | "SDLMAME_NET_PCAP", | |
| 12 | "USE_NETWORK", | |
| 13 | "OSD_NET_USE_PCAP", | |
| 13 | 14 | } |
| 14 | 15 | end |
| r245378 | r245379 | |
|---|---|---|
| 1 | #ifdef | |
| 1 | #if defined(OSD_NET_USE_PCAP) | |
| 2 | 2 | |
| 3 | 3 | #if defined(SDLMAME_WIN32) || defined(OSD_WINDOWS) |
| 4 | 4 |
| r245378 | r245379 | |
|---|---|---|
| 1 | #if defined(SD | |
| 1 | #if defined(OSD_NET_USE_TAPTUN) | |
| 2 | 2 | |
| 3 | 3 | #include <unistd.h> |
| 4 | 4 | #include <fcntl.h> |
| https://github.com/mamedev/mame/commit/5ca708070350265b744537354867b1510f1eff1f |
| Previous | 199869 Revisions | Next |