diff options
author | 2015-04-01 18:00:35 +1100 | |
---|---|---|
committer | 2015-04-01 18:00:35 +1100 | |
commit | 5ca708070350265b744537354867b1510f1eff1f (patch) | |
tree | f6cd9d196dc8bfece85e0c902ed8cdf9ad93d099 /scripts/src | |
parent | 19d52cef70b0ef0c373ddb8c49cefd179d309f37 (diff) |
Link osdnet into a library reflecting its location, define USE_NETWORK properly, don't use SDL in non-SDL-specific macros
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/emu.lua | 1 | ||||
-rw-r--r-- | scripts/src/osd/modules.lua | 1 | ||||
-rw-r--r-- | scripts/src/osd/sdl_cfg.lua | 3 | ||||
-rw-r--r-- | scripts/src/osd/windows_cfg.lua | 3 |
4 files changed, 5 insertions, 3 deletions
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 0edea0f04e5..192dd0cd1b5 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -123,7 +123,6 @@ files { MAME_DIR .. "src/emu/debug/textbuf.c", MAME_DIR .. "src/emu/profiler.c", MAME_DIR .. "src/emu/webengine.c", - MAME_DIR .. "src/osd/osdnet.c", MAME_DIR .. "src/emu/sound/filter.c", MAME_DIR .. "src/emu/sound/flt_vol.c", MAME_DIR .. "src/emu/sound/flt_rc.c", diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 41408e46156..fafed82090f 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -9,6 +9,7 @@ function osdmodulesbuild() } files { + MAME_DIR .. "src/osd/osdnet.c", MAME_DIR .. "src/osd/modules/lib/osdobj_common.c", MAME_DIR .. "src/osd/modules/debugger/none.c", MAME_DIR .. "src/osd/modules/debugger/debugint.c", diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index 2636438d3e5..7f990ed31e6 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -4,7 +4,8 @@ forcedincludes { if SDL_NETWORK~="" and not _OPTIONS["DONT_USE_NETWORK"] then defines { - "SDLMAME_NET_" .. string.upper(SDL_NETWORK), + "USE_NETWORK", + "OSD_NET_USE_" .. string.upper(SDL_NETWORK), } end diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua index ddcb923b4c8..e123af16759 100644 --- a/scripts/src/osd/windows_cfg.lua +++ b/scripts/src/osd/windows_cfg.lua @@ -9,6 +9,7 @@ defines { if not _OPTIONS["DONT_USE_NETWORK"] then defines { - "SDLMAME_NET_PCAP", + "USE_NETWORK", + "OSD_NET_USE_PCAP", } end |