diff options
Diffstat (limited to 'scripts/src/osd/sdl_cfg.lua')
-rw-r--r-- | scripts/src/osd/sdl_cfg.lua | 43 |
1 files changed, 27 insertions, 16 deletions
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index ad3750184fd..f3a970c4ad4 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -7,11 +7,20 @@ forcedincludes { MAME_DIR .. "src/osd/sdl/sdlprefix.h" } -if SDL_NETWORK~="" and not _OPTIONS["DONT_USE_NETWORK"] then +if _OPTIONS["USE_TAPTUN"]=="1" or _OPTIONS["USE_PCAP"]=="1" then defines { "USE_NETWORK", - "OSD_NET_USE_" .. string.upper(SDL_NETWORK), } + 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["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS["MESA_INSTALL_ROOT"] then @@ -86,20 +95,22 @@ if BASE_TARGETOS=="unix" then "SDLMAME_UNIX", } if _OPTIONS["targetos"]=="macosx" then - if _OPTIONS["with-bundled-sdl2"]==nil then - if _OPTIONS["USE_LIBSDL"]~="1" then - buildoptions { - "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"], - } - else - defines { - "MACOSX_USE_LIBSDL", - } - buildoptions { - backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL2::'"), - } - end + if _OPTIONS["USE_LIBSDL"]~="1" then + buildoptions { + "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"], + } + else + defines { + "MACOSX_USE_LIBSDL", + } + buildoptions { + backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL2::'"), + } end + elseif _OPTIONS["targetos"]=="android" then + buildoptions { + backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL2::'"), + } else buildoptions { backtick(sdlconfigcmd() .. " --cflags"), @@ -117,7 +128,7 @@ if _OPTIONS["targetos"]=="windows" then defines { "UNICODE", "_UNICODE", - "_WIN32_WINNT=0x0501", + "_WIN32_WINNT=0x0600", "WIN32_LEAN_AND_MEAN", "NOMINMAX", } |