summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/osd
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src/osd')
-rw-r--r--scripts/src/osd/mac.lua7
-rw-r--r--scripts/src/osd/mac_cfg.lua13
-rw-r--r--scripts/src/osd/modules.lua366
-rw-r--r--scripts/src/osd/sdl.lua152
-rw-r--r--scripts/src/osd/sdl_cfg.lua43
-rw-r--r--scripts/src/osd/uwp.lua121
-rw-r--r--scripts/src/osd/uwp_cfg.lua20
-rw-r--r--scripts/src/osd/windows.lua57
-rw-r--r--scripts/src/osd/windows_cfg.lua25
9 files changed, 406 insertions, 398 deletions
diff --git a/scripts/src/osd/mac.lua b/scripts/src/osd/mac.lua
index 1110dbda9f1..f72c8605365 100644
--- a/scripts/src/osd/mac.lua
+++ b/scripts/src/osd/mac.lua
@@ -23,6 +23,7 @@ BASE_TARGETOS = "unix"
local os_version = str_to_version(backtick("sw_vers -productVersion"))
links {
"Cocoa.framework",
+ "IOKit.framework"
}
linkoptions {
"-framework QuartzCore",
@@ -102,12 +103,16 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/debugger/osx/disassemblyview.h",
MAME_DIR .. "src/osd/modules/debugger/osx/errorlogviewer.mm",
MAME_DIR .. "src/osd/modules/debugger/osx/errorlogviewer.h",
+ MAME_DIR .. "src/osd/modules/debugger/osx/exceptionpointsview.mm",
+ MAME_DIR .. "src/osd/modules/debugger/osx/exceptionpointsview.h",
MAME_DIR .. "src/osd/modules/debugger/osx/memoryview.mm",
MAME_DIR .. "src/osd/modules/debugger/osx/memoryview.h",
MAME_DIR .. "src/osd/modules/debugger/osx/memoryviewer.mm",
MAME_DIR .. "src/osd/modules/debugger/osx/memoryviewer.h",
MAME_DIR .. "src/osd/modules/debugger/osx/pointsviewer.mm",
MAME_DIR .. "src/osd/modules/debugger/osx/pointsviewer.h",
+ MAME_DIR .. "src/osd/modules/debugger/osx/registerpointsview.mm",
+ MAME_DIR .. "src/osd/modules/debugger/osx/registerpointsview.h",
MAME_DIR .. "src/osd/modules/debugger/osx/registersview.mm",
MAME_DIR .. "src/osd/modules/debugger/osx/registersview.h",
MAME_DIR .. "src/osd/modules/debugger/osx/watchpointsview.mm",
@@ -156,6 +161,7 @@ project ("ocore_" .. _OPTIONS["osd"])
files {
MAME_DIR .. "src/osd/osdcore.cpp",
MAME_DIR .. "src/osd/osdcore.h",
+ MAME_DIR .. "src/osd/osdfile.h",
MAME_DIR .. "src/osd/strconv.cpp",
MAME_DIR .. "src/osd/strconv.h",
MAME_DIR .. "src/osd/osdsync.cpp",
@@ -165,7 +171,6 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/lib/osdlib_macosx.cpp",
MAME_DIR .. "src/osd/modules/lib/osdlib.h",
MAME_DIR .. "src/osd/modules/file/posixdir.cpp",
- MAME_DIR .. "src/osd/modules/file/posixdomain.cpp",
MAME_DIR .. "src/osd/modules/file/posixfile.cpp",
MAME_DIR .. "src/osd/modules/file/posixfile.h",
MAME_DIR .. "src/osd/modules/file/posixptty.cpp",
diff --git a/scripts/src/osd/mac_cfg.lua b/scripts/src/osd/mac_cfg.lua
index 76f0ac4ac1b..e75c8d009a2 100644
--- a/scripts/src/osd/mac_cfg.lua
+++ b/scripts/src/osd/mac_cfg.lua
@@ -7,11 +7,20 @@ forcedincludes {
-- MAME_DIR .. "src/osd/sdl/sdlprefix.h"
}
-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",
}
+ 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
defines {
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 4675139f87a..b532124302f 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -16,7 +16,7 @@ end
function addlibfromstring(str)
if (str==nil) then return end
for w in str:gmatch("%S+") do
- if string.starts(w,"-l")==true then
+ if string.starts(w,"-l") then
links {
string.sub(w,3)
}
@@ -27,7 +27,7 @@ end
function addoptionsfromstring(str)
if (str==nil) then return end
for w in str:gmatch("%S+") do
- if string.starts(w,"-l")==false then
+ if not string.starts(w,"-l") then
linkoptions {
w
}
@@ -50,78 +50,108 @@ function osdmodulesbuild()
}
files {
- MAME_DIR .. "src/osd/osdnet.cpp",
- MAME_DIR .. "src/osd/osdnet.h",
MAME_DIR .. "src/osd/watchdog.cpp",
MAME_DIR .. "src/osd/watchdog.h",
+ MAME_DIR .. "src/osd/interface/audio.h",
+ MAME_DIR .. "src/osd/interface/inputcode.h",
+ MAME_DIR .. "src/osd/interface/inputdev.h",
+ MAME_DIR .. "src/osd/interface/inputfwd.h",
+ MAME_DIR .. "src/osd/interface/inputman.h",
+ MAME_DIR .. "src/osd/interface/inputseq.cpp",
+ MAME_DIR .. "src/osd/interface/inputseq.h",
+ MAME_DIR .. "src/osd/interface/midiport.h",
+ MAME_DIR .. "src/osd/interface/nethandler.cpp",
+ MAME_DIR .. "src/osd/interface/nethandler.h",
+ MAME_DIR .. "src/osd/interface/uievents.h",
MAME_DIR .. "src/osd/modules/debugger/debug_module.h",
- MAME_DIR .. "src/osd/modules/font/font_module.h",
- MAME_DIR .. "src/osd/modules/midi/midi_module.h",
- MAME_DIR .. "src/osd/modules/netdev/netdev_module.h",
- MAME_DIR .. "src/osd/modules/sound/sound_module.h",
+ MAME_DIR .. "src/osd/modules/debugger/debuggdbstub.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/debugimgui.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/debugwin.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/none.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/xmlconfig.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/xmlconfig.h",
MAME_DIR .. "src/osd/modules/diagnostics/diagnostics_module.h",
- MAME_DIR .. "src/osd/modules/monitor/monitor_module.h",
- MAME_DIR .. "src/osd/modules/lib/osdobj_common.cpp",
- MAME_DIR .. "src/osd/modules/lib/osdobj_common.h",
- MAME_DIR .. "src/osd/modules/diagnostics/none.cpp",
MAME_DIR .. "src/osd/modules/diagnostics/diagnostics_win32.cpp",
- MAME_DIR .. "src/osd/modules/debugger/none.cpp",
- MAME_DIR .. "src/osd/modules/debugger/debugwin.cpp",
- MAME_DIR .. "src/osd/modules/debugger/debugimgui.cpp",
- MAME_DIR .. "src/osd/modules/debugger/debuggdbstub.cpp",
- MAME_DIR .. "src/osd/modules/font/font_sdl.cpp",
- MAME_DIR .. "src/osd/modules/font/font_windows.cpp",
+ MAME_DIR .. "src/osd/modules/diagnostics/none.cpp",
MAME_DIR .. "src/osd/modules/font/font_dwrite.cpp",
- MAME_DIR .. "src/osd/modules/font/font_osx.cpp",
+ MAME_DIR .. "src/osd/modules/font/font_module.h",
MAME_DIR .. "src/osd/modules/font/font_none.cpp",
- MAME_DIR .. "src/osd/modules/netdev/taptun.cpp",
- MAME_DIR .. "src/osd/modules/netdev/pcap.cpp",
- MAME_DIR .. "src/osd/modules/netdev/none.cpp",
- MAME_DIR .. "src/osd/modules/midi/portmidi.cpp",
- MAME_DIR .. "src/osd/modules/midi/none.cpp",
- MAME_DIR .. "src/osd/modules/sound/js_sound.cpp",
- MAME_DIR .. "src/osd/modules/sound/direct_sound.cpp",
- MAME_DIR .. "src/osd/modules/sound/pa_sound.cpp",
- MAME_DIR .. "src/osd/modules/sound/coreaudio_sound.cpp",
- MAME_DIR .. "src/osd/modules/sound/sdl_sound.cpp",
- MAME_DIR .. "src/osd/modules/sound/xaudio2_sound.cpp",
- MAME_DIR .. "src/osd/modules/sound/none.cpp",
- MAME_DIR .. "src/osd/modules/input/input_module.h",
+ MAME_DIR .. "src/osd/modules/font/font_osx.cpp",
+ MAME_DIR .. "src/osd/modules/font/font_sdl.cpp",
+ MAME_DIR .. "src/osd/modules/font/font_windows.cpp",
+ MAME_DIR .. "src/osd/modules/input/assignmenthelper.cpp",
+ MAME_DIR .. "src/osd/modules/input/assignmenthelper.h",
MAME_DIR .. "src/osd/modules/input/input_common.cpp",
MAME_DIR .. "src/osd/modules/input/input_common.h",
MAME_DIR .. "src/osd/modules/input/input_dinput.cpp",
MAME_DIR .. "src/osd/modules/input/input_dinput.h",
+ MAME_DIR .. "src/osd/modules/input/input_mac.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_module.h",
MAME_DIR .. "src/osd/modules/input/input_none.cpp",
MAME_DIR .. "src/osd/modules/input/input_rawinput.cpp",
- MAME_DIR .. "src/osd/modules/input/input_win32.cpp",
MAME_DIR .. "src/osd/modules/input/input_sdl.cpp",
- MAME_DIR .. "src/osd/modules/input/input_sdlcommon.cpp",
- MAME_DIR .. "src/osd/modules/input/input_sdlcommon.h",
- MAME_DIR .. "src/osd/modules/input/input_x11.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_win32.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_wincommon.h",
MAME_DIR .. "src/osd/modules/input/input_windows.cpp",
MAME_DIR .. "src/osd/modules/input/input_windows.h",
+ MAME_DIR .. "src/osd/modules/input/input_winhybrid.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_x11.cpp",
MAME_DIR .. "src/osd/modules/input/input_xinput.cpp",
MAME_DIR .. "src/osd/modules/input/input_xinput.h",
- MAME_DIR .. "src/osd/modules/input/input_winhybrid.cpp",
- MAME_DIR .. "src/osd/modules/input/input_uwp.cpp",
- MAME_DIR .. "src/osd/modules/input/input_mac.cpp",
- MAME_DIR .. "src/osd/modules/output/output_module.h",
- MAME_DIR .. "src/osd/modules/output/none.cpp",
+ MAME_DIR .. "src/osd/modules/lib/osdobj_common.cpp",
+ MAME_DIR .. "src/osd/modules/lib/osdobj_common.h",
+ MAME_DIR .. "src/osd/modules/midi/midi_module.h",
+ MAME_DIR .. "src/osd/modules/midi/none.cpp",
+ MAME_DIR .. "src/osd/modules/midi/portmidi.cpp",
+ MAME_DIR .. "src/osd/modules/monitor/monitor_common.cpp",
+ MAME_DIR .. "src/osd/modules/monitor/monitor_common.h",
+ MAME_DIR .. "src/osd/modules/monitor/monitor_dxgi.cpp",
+ MAME_DIR .. "src/osd/modules/monitor/monitor_mac.cpp",
+ MAME_DIR .. "src/osd/modules/monitor/monitor_module.h",
+ MAME_DIR .. "src/osd/modules/monitor/monitor_sdl.cpp",
+ MAME_DIR .. "src/osd/modules/monitor/monitor_win32.cpp",
+ MAME_DIR .. "src/osd/modules/netdev/netdev_common.cpp",
+ MAME_DIR .. "src/osd/modules/netdev/netdev_common.h",
+ MAME_DIR .. "src/osd/modules/netdev/netdev_module.h",
+ MAME_DIR .. "src/osd/modules/netdev/none.cpp",
+ MAME_DIR .. "src/osd/modules/netdev/pcap.cpp",
+ MAME_DIR .. "src/osd/modules/netdev/taptun.cpp",
MAME_DIR .. "src/osd/modules/output/console.cpp",
MAME_DIR .. "src/osd/modules/output/network.cpp",
+ MAME_DIR .. "src/osd/modules/output/none.cpp",
+ MAME_DIR .. "src/osd/modules/output/output_module.h",
MAME_DIR .. "src/osd/modules/output/win32_output.cpp",
MAME_DIR .. "src/osd/modules/output/win32_output.h",
- MAME_DIR .. "src/osd/modules/monitor/monitor_common.h",
- MAME_DIR .. "src/osd/modules/monitor/monitor_common.cpp",
- MAME_DIR .. "src/osd/modules/monitor/monitor_win32.cpp",
- MAME_DIR .. "src/osd/modules/monitor/monitor_dxgi.cpp",
- MAME_DIR .. "src/osd/modules/monitor/monitor_sdl.cpp",
- MAME_DIR .. "src/osd/modules/monitor/monitor_mac.cpp",
+ MAME_DIR .. "src/osd/modules/render/blit13.ipp",
+ MAME_DIR .. "src/osd/modules/render/draw13.cpp",
+ MAME_DIR .. "src/osd/modules/render/drawgdi.cpp",
+ MAME_DIR .. "src/osd/modules/render/drawnone.cpp",
+ MAME_DIR .. "src/osd/modules/render/drawogl.cpp",
+ MAME_DIR .. "src/osd/modules/render/drawsdl.cpp",
+ MAME_DIR .. "src/osd/modules/render/render_module.h",
+ MAME_DIR .. "src/osd/modules/sound/coreaudio_sound.cpp",
+ MAME_DIR .. "src/osd/modules/sound/direct_sound.cpp",
+ MAME_DIR .. "src/osd/modules/sound/js_sound.cpp",
+ MAME_DIR .. "src/osd/modules/sound/none.cpp",
+ MAME_DIR .. "src/osd/modules/sound/pa_sound.cpp",
+ MAME_DIR .. "src/osd/modules/sound/pulse_sound.cpp",
+ MAME_DIR .. "src/osd/modules/sound/pipewire_sound.cpp",
+ MAME_DIR .. "src/osd/modules/sound/sdl_sound.cpp",
+ MAME_DIR .. "src/osd/modules/sound/sound_module.cpp",
+ MAME_DIR .. "src/osd/modules/sound/sound_module.h",
+ MAME_DIR .. "src/osd/modules/sound/xaudio2_sound.cpp",
}
includedirs {
+ MAME_DIR .. "src/osd",
ext_includedir("asio"),
}
+ if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then
+ buildoptions {
+ "-Wno-unused-private-field",
+ }
+ end
+
if _OPTIONS["targetos"]=="windows" then
includedirs {
MAME_DIR .. "3rdparty/winpcap/Include",
@@ -140,7 +170,6 @@ function osdmodulesbuild()
}
else
files {
- MAME_DIR .. "src/osd/modules/render/drawogl.cpp",
MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.cpp",
MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.cpp",
MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.h",
@@ -161,7 +190,7 @@ function osdmodulesbuild()
"__STDC_LIMIT_MACROS",
"__STDC_FORMAT_MACROS",
"__STDC_CONSTANT_MACROS",
- "IMGUI_DISABLE_OBSOLETE_FUNCTIONS",
+ "BX_CONFIG_DEBUG=0",
}
files {
@@ -172,51 +201,90 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/render/bgfxutil.h",
MAME_DIR .. "src/osd/modules/render/binpacker.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/blendreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/blendreader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/chain.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chain.h",
MAME_DIR .. "src/osd/modules/render/bgfx/chainentry.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chainentry.h",
MAME_DIR .. "src/osd/modules/render/bgfx/chainentryreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chainentryreader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/chainmanager.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chainmanager.h",
MAME_DIR .. "src/osd/modules/render/bgfx/chainreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chainreader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/clear.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/clear.h",
MAME_DIR .. "src/osd/modules/render/bgfx/clearreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/clearreader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/cullreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/cullreader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/depthreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/depthreader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/effect.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/effect.h",
MAME_DIR .. "src/osd/modules/render/bgfx/effectmanager.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/effectmanager.h",
MAME_DIR .. "src/osd/modules/render/bgfx/effectreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/effectreader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/entryuniformreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/entryuniformreader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/inputpair.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/inputpair.h",
MAME_DIR .. "src/osd/modules/render/bgfx/frameparameter.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/frameparameter.h",
MAME_DIR .. "src/osd/modules/render/bgfx/timeparameter.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/timeparameter.h",
MAME_DIR .. "src/osd/modules/render/bgfx/paramreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/paramreader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/paramuniform.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/paramuniform.h",
MAME_DIR .. "src/osd/modules/render/bgfx/paramuniformreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/paramuniformreader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/shadermanager.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/shadermanager.h",
MAME_DIR .. "src/osd/modules/render/bgfx/slider.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/slider.h",
MAME_DIR .. "src/osd/modules/render/bgfx/sliderreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/sliderreader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/slideruniform.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/slideruniform.h",
MAME_DIR .. "src/osd/modules/render/bgfx/slideruniformreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/slideruniformreader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/statereader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/statereader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/suppressor.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/suppressor.h",
MAME_DIR .. "src/osd/modules/render/bgfx/suppressorreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/suppressorreader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/target.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/target.h",
MAME_DIR .. "src/osd/modules/render/bgfx/targetreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/targetreader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/targetmanager.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/targetmanager.h",
MAME_DIR .. "src/osd/modules/render/bgfx/texture.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/texture.h",
+ MAME_DIR .. "src/osd/modules/render/bgfx/texturehandleprovider.h",
MAME_DIR .. "src/osd/modules/render/bgfx/texturemanager.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/texturemanager.h",
MAME_DIR .. "src/osd/modules/render/bgfx/uniform.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/uniform.h",
MAME_DIR .. "src/osd/modules/render/bgfx/uniformreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/uniformreader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/valueuniform.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/valueuniform.h",
MAME_DIR .. "src/osd/modules/render/bgfx/valueuniformreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/valueuniformreader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/view.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/view.h",
MAME_DIR .. "src/osd/modules/render/bgfx/writereader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/writereader.h",
}
includedirs {
MAME_DIR .. "3rdparty/bgfx/examples/common",
MAME_DIR .. "3rdparty/bgfx/include",
MAME_DIR .. "3rdparty/bgfx/3rdparty",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos",
MAME_DIR .. "3rdparty/bx/include",
ext_includedir("rapidjson")
}
@@ -231,6 +299,28 @@ function osdmodulesbuild()
}
end
+ if _OPTIONS["NO_USE_PULSEAUDIO"]=="1" then
+ defines {
+ "NO_USE_PULSEAUDIO",
+ }
+ end
+
+ err = os.execute(pkgconfigcmd() .. " --exists libpipewire-0.3")
+ if not err then
+ _OPTIONS["NO_USE_PIPEWIRE"] = "1"
+ end
+
+ if _OPTIONS["NO_USE_PIPEWIRE"]=="1" then
+ defines {
+ "NO_USE_PIPEWIRE",
+ }
+ else
+ buildoptions {
+ backtick(pkgconfigcmd() .. " --cflags libpipewire-0.3"),
+ }
+ end
+
+
if _OPTIONS["NO_USE_MIDI"]=="1" then
defines {
"NO_USE_MIDI",
@@ -262,11 +352,9 @@ function qtdebuggerbuild()
local version = str_to_version(_OPTIONS["gcc_version"])
if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then
configuration { "gmake or ninja" }
- if (version >= 30600) then
- buildoptions {
- "-Wno-inconsistent-missing-override",
- }
- end
+ buildoptions {
+ "-Wno-error=inconsistent-missing-override",
+ }
configuration { }
end
@@ -313,18 +401,28 @@ function qtdebuggerbuild()
MOC = "moc"
else
if _OPTIONS["QT_HOME"]~=nil then
- QMAKETST = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake --version 2>/dev/null")
- if (QMAKETST=='') then
- print("Qt's Meta Object Compiler (moc) wasn't found!")
- os.exit(1)
+ MOCTST = backtick(_OPTIONS["QT_HOME"] .. "/bin/moc --version 2>/dev/null")
+ if (MOCTST=='') then
+ local qt_host_libexecs = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_HOST_LIBEXECS")
+ if not string.starts(qt_host_libexecs,"/") then
+ qt_host_libexecs = _OPTIONS["QT_HOME"] .. "/libexec"
+ end
+ MOCTST = backtick(qt_host_libexecs .. "/moc --version 2>/dev/null")
+ if MOCTST=='' then
+ print("Qt's Meta Object Compiler (moc) wasn't found!")
+ os.exit(1)
+ else
+ MOC = qt_host_libexecs .. "/moc"
+ end
+ else
+ MOC = _OPTIONS["QT_HOME"] .. "/bin/moc"
end
- MOC = _OPTIONS["QT_HOME"] .. "/bin/moc"
else
MOCTST = backtick("which moc-qt5 2>/dev/null")
if (MOCTST=='') then
MOCTST = backtick("which moc 2>/dev/null")
end
- if (MOCTST=='') then
+ if MOCTST=='' then
print("Qt's Meta Object Compiler (moc) wasn't found!")
os.exit(1)
end
@@ -334,15 +432,15 @@ function qtdebuggerbuild()
custombuildtask {
- { MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.h", GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.cpp", { }, { MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.h", GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.cpp", { }, { MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.h", GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.h", GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.h", GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.h", GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.h", GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceinformationwindow.moc.cpp", { },{ MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.h", GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.cpp", { }, { MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" } },
+ { MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.h", GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.cpp", { }, { MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" } },
+ { MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.h", GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" } },
+ { MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.h", GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" } },
+ { MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.h", GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" } },
+ { MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.h", GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" } },
+ { MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.h", GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" } },
+ { MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" } },
+ { MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceinformationwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) -b emu.h $(<) -o $(@)" } },
}
@@ -419,24 +517,42 @@ function osdmodulestargetconf()
"Qt5Widgets.dll",
}
elseif _OPTIONS["targetos"]=="macosx" then
+ local qt_version = str_to_version(backtick("qmake -query QT_VERSION"))
linkoptions {
"-F" .. backtick("qmake -query QT_INSTALL_LIBS"),
}
- links {
- "Qt5Core.framework",
- "Qt5Gui.framework",
- "Qt5Widgets.framework",
- }
+ if qt_version < 60000 then
+ links {
+ "Qt5Core.framework",
+ "Qt5Gui.framework",
+ "Qt5Widgets.framework",
+ }
+ else
+ links {
+ "QtCore.framework",
+ "QtGui.framework",
+ "QtWidgets.framework",
+ }
+ end
else
if _OPTIONS["QT_HOME"]~=nil then
+ local qt_version = str_to_version(backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_VERSION"))
linkoptions {
"-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"),
}
- links {
- "Qt5Core",
- "Qt5Gui",
- "Qt5Widgets",
- }
+ if qt_version < 60000 then
+ links {
+ "Qt5Core",
+ "Qt5Gui",
+ "Qt5Widgets",
+ }
+ else
+ links {
+ "Qt6Core",
+ "Qt6Gui",
+ "Qt6Widgets",
+ }
+ end
else
local str = backtick(pkgconfigcmd() .. " --libs Qt5Widgets")
addlibfromstring(str)
@@ -462,12 +578,36 @@ function osdmodulestargetconf()
}
end
+ if _OPTIONS["NO_USE_PULSEAUDIO"]=="0" then
+ links {
+ ext_lib("pulse"),
+ }
+ end
+
+ if _OPTIONS["NO_USE_PIPEWIRE"]=="0" then
+ local str = backtick(pkgconfigcmd() .. " --libs libpipewire-0.3")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
+ end
end
newoption {
- trigger = "DONT_USE_NETWORK",
- description = "Disable network access",
+ trigger = "USE_TAPTUN",
+ description = "Include tap/tun network module",
+ allowed = {
+ { "0", "Don't include tap/tun network module" },
+ { "1", "Include tap/tun network module" },
+ },
+}
+
+newoption {
+ trigger = "USE_PCAP",
+ description = "Include pcap network module",
+ allowed = {
+ { "0", "Don't include pcap network module" },
+ { "1", "Include pcap network module" },
+ },
}
newoption {
@@ -479,6 +619,14 @@ newoption {
},
}
+if not _OPTIONS["NO_OPENGL"] then
+ if _OPTIONS["targetos"] == "android" then
+ _OPTIONS["NO_OPENGL"] = "1"
+ else
+ _OPTIONS["NO_OPENGL"] = "0"
+ end
+end
+
newoption {
trigger = "USE_DISPATCH_GL",
description = "Use GL-dispatching",
@@ -502,7 +650,7 @@ newoption {
}
if not _OPTIONS["NO_USE_MIDI"] then
- if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" then
+ if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" or _OPTIONS["targetos"] == "android" then
_OPTIONS["NO_USE_MIDI"] = "1"
else
_OPTIONS["NO_USE_MIDI"] = "0"
@@ -527,6 +675,40 @@ if not _OPTIONS["NO_USE_PORTAUDIO"] then
end
newoption {
+ trigger = "NO_USE_PULSEAUDIO",
+ description = "Disable PulseAudio interface",
+ allowed = {
+ { "0", "Enable PulseAudio" },
+ { "1", "Disable PulseAudio" },
+ },
+}
+
+if not _OPTIONS["NO_USE_PULSEAUDIO"] then
+ if _OPTIONS["targetos"]=="linux" then
+ _OPTIONS["NO_USE_PULSEAUDIO"] = "0"
+ else
+ _OPTIONS["NO_USE_PULSEAUDIO"] = "1"
+ end
+end
+
+newoption {
+ trigger = "NO_USE_PIPEWIRE",
+ description = "Disable Pipewire interface",
+ allowed = {
+ { "0", "Enable Pipewire" },
+ { "1", "Disable Pipewire" },
+ },
+}
+
+if not _OPTIONS["NO_USE_PIPEWIRE"] then
+ if _OPTIONS["targetos"]=="linux" then
+ _OPTIONS["NO_USE_PIPEWIRE"] = "0"
+ else
+ _OPTIONS["NO_USE_PIPEWIRE"] = "1"
+ end
+end
+
+newoption {
trigger = "MODERN_WIN_API",
description = "Use Modern Windows APIs",
allowed = {
@@ -539,7 +721,7 @@ newoption {
trigger = "USE_QTDEBUG",
description = "Use QT debugger",
allowed = {
- { "0", "Don't use Qt debugger" },
+ { "0", "Don't use Qt debugger" },
{ "1", "Use Qt debugger" },
},
}
@@ -550,8 +732,24 @@ newoption {
}
+if not _OPTIONS["USE_TAPTUN"] then
+ if _OPTIONS["targetos"]=="linux" or _OPTIONS["targetos"]=="windows" then
+ _OPTIONS["USE_TAPTUN"] = "1"
+ else
+ _OPTIONS["USE_TAPTUN"] = "0"
+ end
+end
+
+if not _OPTIONS["USE_PCAP"] then
+ if _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="netbsd" then
+ _OPTIONS["USE_PCAP"] = "1"
+ else
+ _OPTIONS["USE_PCAP"] = "0"
+ end
+end
+
if not _OPTIONS["USE_QTDEBUG"] then
- if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" then
+ if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" or _OPTIONS["targetos"]=="android" then
_OPTIONS["USE_QTDEBUG"] = "0"
else
_OPTIONS["USE_QTDEBUG"] = "1"
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index ed660e65f9b..93dba9ae67a 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -29,6 +29,12 @@ function maintargetosdoptions(_target,_subtarget)
"X11",
"Xinerama",
}
+ else
+ if _OPTIONS["targetos"]=="linux" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="openbsd" then
+ links {
+ "EGL",
+ }
+ end
end
if _OPTIONS["NO_USE_XINPUT"]~="1" then
@@ -48,14 +54,11 @@ function maintargetosdoptions(_target,_subtarget)
end
if _OPTIONS["targetos"]=="windows" then
- if _OPTIONS["with-bundled-sdl2"]~=nil then
+ if _OPTIONS["USE_LIBSDL"]~="1" then
configuration { "mingw*"}
links {
+ "SDL2main",
"SDL2",
- "imm32",
- "version",
- "ole32",
- "oleaut32",
}
configuration { "vs*" }
links {
@@ -65,35 +68,22 @@ function maintargetosdoptions(_target,_subtarget)
}
configuration { }
else
- if _OPTIONS["USE_LIBSDL"]~="1" then
- configuration { "mingw*"}
- links {
- "SDL2main",
- "SDL2",
- }
- configuration { "vs*" }
- links {
- "SDL2",
- "imm32",
- "version",
- }
- configuration { }
- else
- local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
- addlibfromstring(str)
- addoptionsfromstring(str)
- end
- configuration { "x32", "vs*" }
- libdirs {
- path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x86")
- }
- configuration { "x64", "vs*" }
- libdirs {
- path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64")
- }
- configuration { }
+ local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
end
+ configuration { "x32", "vs*" }
+ libdirs {
+ path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x86")
+ }
+ configuration { "x64", "vs*" }
+ libdirs {
+ path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64")
+ }
+ configuration { }
+
links {
+ "dinput8",
"psapi",
}
elseif _OPTIONS["targetos"]=="haiku" then
@@ -110,15 +100,6 @@ function maintargetosdoptions(_target,_subtarget)
"ole32",
}
configuration { }
-
- if _OPTIONS["targetos"]=="macosx" then
- if _OPTIONS["with-bundled-sdl2"]~=nil then
- links {
- "SDL2",
- }
- end
- end
-
end
@@ -153,7 +134,7 @@ newoption {
}
if not _OPTIONS["NO_X11"] then
- if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" then
+ if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" or _OPTIONS["targetos"]=="android" then
_OPTIONS["NO_X11"] = "1"
else
_OPTIONS["NO_X11"] = "0"
@@ -170,7 +151,7 @@ newoption {
}
if not _OPTIONS["NO_USE_XINPUT"] then
- if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" then
+ if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" or _OPTIONS["targetos"]=="android" then
_OPTIONS["NO_USE_XINPUT"] = "1"
else
_OPTIONS["NO_USE_XINPUT"] = "0"
@@ -233,28 +214,18 @@ end
BASE_TARGETOS = "unix"
SDLOS_TARGETOS = "unix"
-SDL_NETWORK = ""
if _OPTIONS["targetos"]=="linux" then
- SDL_NETWORK = "taptun"
elseif _OPTIONS["targetos"]=="openbsd" then
elseif _OPTIONS["targetos"]=="netbsd" then
- SDL_NETWORK = "pcap"
elseif _OPTIONS["targetos"]=="haiku" then
elseif _OPTIONS["targetos"]=="asmjs" then
elseif _OPTIONS["targetos"]=="windows" then
BASE_TARGETOS = "win32"
SDLOS_TARGETOS = "win32"
- SDL_NETWORK = "pcap"
elseif _OPTIONS["targetos"]=="macosx" then
SDLOS_TARGETOS = "macosx"
- SDL_NETWORK = "pcap"
end
-if _OPTIONS["with-bundled-sdl2"]~=nil then
- includedirs {
- GEN_DIR .. "includes",
- }
-end
if BASE_TARGETOS=="unix" then
if _OPTIONS["targetos"]=="macosx" then
local os_version = str_to_version(backtick("sw_vers -productVersion"))
@@ -265,6 +236,8 @@ if BASE_TARGETOS=="unix" then
linkoptions {
"-framework QuartzCore",
"-framework OpenGL",
+ "-framework IOKit",
+ "-rpath " .. _OPTIONS["SDL_FRAMEWORK_PATH"],
}
@@ -273,28 +246,17 @@ if BASE_TARGETOS=="unix" then
"-weak_framework Metal",
}
end
- if _OPTIONS["with-bundled-sdl2"]~=nil then
+ if _OPTIONS["USE_LIBSDL"]~="1" then
linkoptions {
- "-framework AudioUnit",
- "-framework CoreAudio",
- "-framework Carbon",
- "-framework ForceFeedback",
- "-framework IOKit",
- "-framework CoreVideo",
+ "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
+ }
+ links {
+ "SDL2.framework",
}
else
- if _OPTIONS["USE_LIBSDL"]~="1" then
- linkoptions {
- "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
- }
- links {
- "SDL2.framework",
- }
- else
- local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'")
- addlibfromstring(str)
- addoptionsfromstring(str)
- end
+ local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
end
else
if _OPTIONS["NO_X11"]=="1" then
@@ -306,17 +268,9 @@ if BASE_TARGETOS=="unix" then
"/usr/openwin/lib",
}
end
- if _OPTIONS["with-bundled-sdl2"]~=nil then
- if _OPTIONS["targetos"]~="android" then
- links {
- "SDL2",
- }
- end
- else
- local str = backtick(sdlconfigcmd() .. " --libs")
- addlibfromstring(str)
- addoptionsfromstring(str)
- end
+ local str = backtick(sdlconfigcmd() .. " --libs")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
if _OPTIONS["targetos"]~="haiku" and _OPTIONS["targetos"]~="android" then
links {
@@ -379,12 +333,6 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/sdl",
}
- if _OPTIONS["targetos"]=="windows" then
- files {
- MAME_DIR .. "src/osd/windows/main.cpp",
- }
- end
-
if _OPTIONS["targetos"]=="macosx" then
files {
MAME_DIR .. "src/osd/modules/debugger/debugosx.mm",
@@ -409,6 +357,8 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/debugger/osx/disassemblyviewer.h",
MAME_DIR .. "src/osd/modules/debugger/osx/errorlogview.mm",
MAME_DIR .. "src/osd/modules/debugger/osx/errorlogview.h",
+ MAME_DIR .. "src/osd/modules/debugger/osx/exceptionpointsview.mm",
+ MAME_DIR .. "src/osd/modules/debugger/osx/exceptionpointsview.h",
MAME_DIR .. "src/osd/modules/debugger/osx/disassemblyview.h",
MAME_DIR .. "src/osd/modules/debugger/osx/errorlogviewer.mm",
MAME_DIR .. "src/osd/modules/debugger/osx/errorlogviewer.h",
@@ -418,6 +368,8 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/debugger/osx/memoryviewer.h",
MAME_DIR .. "src/osd/modules/debugger/osx/pointsviewer.mm",
MAME_DIR .. "src/osd/modules/debugger/osx/pointsviewer.h",
+ MAME_DIR .. "src/osd/modules/debugger/osx/registerpointsview.mm",
+ MAME_DIR .. "src/osd/modules/debugger/osx/registerpointsview.h",
MAME_DIR .. "src/osd/modules/debugger/osx/registersview.mm",
MAME_DIR .. "src/osd/modules/debugger/osx/registersview.h",
MAME_DIR .. "src/osd/modules/debugger/osx/watchpointsview.mm",
@@ -427,22 +379,19 @@ project ("osd_" .. _OPTIONS["osd"])
end
files {
+ MAME_DIR .. "src/osd/osdepend.h",
+ MAME_DIR .. "src/osd/modules/osdwindow.cpp",
+ MAME_DIR .. "src/osd/modules/osdwindow.h",
+ MAME_DIR .. "src/osd/sdl/osdsdl.cpp",
MAME_DIR .. "src/osd/sdl/osdsdl.h",
- MAME_DIR .. "src/osd/sdl/sdlprefix.h",
MAME_DIR .. "src/osd/sdl/sdlmain.cpp",
- MAME_DIR .. "src/osd/osdepend.h",
+ MAME_DIR .. "src/osd/sdl/sdlopts.cpp",
+ MAME_DIR .. "src/osd/sdl/sdlopts.h",
+ MAME_DIR .. "src/osd/sdl/sdlprefix.h",
MAME_DIR .. "src/osd/sdl/video.cpp",
MAME_DIR .. "src/osd/sdl/window.cpp",
MAME_DIR .. "src/osd/sdl/window.h",
- MAME_DIR .. "src/osd/modules/osdwindow.cpp",
- MAME_DIR .. "src/osd/modules/osdwindow.h",
- MAME_DIR .. "src/osd/modules/render/drawsdl.cpp",
}
- files {
- MAME_DIR .. "src/osd/modules/render/draw13.cpp",
- MAME_DIR .. "src/osd/modules/render/blit13.h",
- }
-
project ("ocore_" .. _OPTIONS["osd"])
targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"])
@@ -466,6 +415,7 @@ project ("ocore_" .. _OPTIONS["osd"])
files {
MAME_DIR .. "src/osd/osdcore.cpp",
MAME_DIR .. "src/osd/osdcore.h",
+ MAME_DIR .. "src/osd/osdfile.h",
MAME_DIR .. "src/osd/strconv.cpp",
MAME_DIR .. "src/osd/strconv.h",
MAME_DIR .. "src/osd/osdsync.cpp",
@@ -479,7 +429,6 @@ project ("ocore_" .. _OPTIONS["osd"])
if BASE_TARGETOS=="unix" then
files {
MAME_DIR .. "src/osd/modules/file/posixdir.cpp",
- MAME_DIR .. "src/osd/modules/file/posixdomain.cpp",
MAME_DIR .. "src/osd/modules/file/posixfile.cpp",
MAME_DIR .. "src/osd/modules/file/posixfile.h",
MAME_DIR .. "src/osd/modules/file/posixptty.cpp",
@@ -495,7 +444,8 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/file/winfile.h",
MAME_DIR .. "src/osd/modules/file/winptty.cpp",
MAME_DIR .. "src/osd/modules/file/winsocket.cpp",
- MAME_DIR .. "src/osd/windows/winutil.cpp", -- FIXME put the necessary functions somewhere more appropriate
+ MAME_DIR .. "src/osd/windows/winutil.cpp", -- FIXME put the necessary functions somewhere more appropriate?
+ MAME_DIR .. "src/osd/windows/winutil.h",
}
else
files {
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",
}
diff --git a/scripts/src/osd/uwp.lua b/scripts/src/osd/uwp.lua
deleted file mode 100644
index 47e8e149e24..00000000000
--- a/scripts/src/osd/uwp.lua
+++ /dev/null
@@ -1,121 +0,0 @@
--- license:BSD-3-Clause
--- copyright-holders:MAMEdev Team
-
----------------------------------------------------------------------------
---
--- uwp.lua
---
--- Rules for the building of UWP OSD
---
----------------------------------------------------------------------------
-
-dofile("modules.lua")
-
-function maintargetosdoptions(_target,_subtarget)
-end
-
-project ("qtdbg_" .. _OPTIONS["osd"])
- uuid (os.uuid("qtdbg_" .. _OPTIONS["osd"]))
- kind (LIBTYPE)
-
- dofile("uwp_cfg.lua")
- includedirs {
- MAME_DIR .. "src/emu",
- MAME_DIR .. "src/devices", -- accessing imagedev from debugger
- MAME_DIR .. "src/osd",
- MAME_DIR .. "src/lib",
- MAME_DIR .. "src/lib/util",
- MAME_DIR .. "src/osd/modules/render",
- MAME_DIR .. "3rdparty",
- }
- removeflags {
- "SingleOutputDir",
- }
-
- files {
- MAME_DIR .. "src/osd/modules/debugger/debugqt.cpp",
- }
-
-project ("osd_" .. _OPTIONS["osd"])
- uuid (os.uuid("osd_" .. _OPTIONS["osd"]))
- kind (LIBTYPE)
-
- removeflags {
- "SingleOutputDir",
- }
-
- dofile("uwp_cfg.lua")
- osdmodulesbuild()
-
- includedirs {
- MAME_DIR .. "src/emu",
- MAME_DIR .. "src/devices", -- accessing imagedev from debugger
- MAME_DIR .. "src/osd",
- MAME_DIR .. "src/lib",
- MAME_DIR .. "src/lib/util",
- MAME_DIR .. "src/osd/modules/file",
- MAME_DIR .. "src/osd/modules/render",
- MAME_DIR .. "3rdparty",
- }
-
- includedirs {
- MAME_DIR .. "src/osd/uwp",
- MAME_DIR .. "src/osd/windows",
- }
-
- files {
- MAME_DIR .. "src/osd/uwp/video.cpp",
- MAME_DIR .. "src/osd/uwp/video.h",
- MAME_DIR .. "src/osd/uwp/window.cpp",
- MAME_DIR .. "src/osd/uwp/window.h",
- MAME_DIR .. "src/osd/windows/winutf8.cpp",
- MAME_DIR .. "src/osd/windows/winutf8.h",
- MAME_DIR .. "src/osd/modules/osdwindow.cpp",
- MAME_DIR .. "src/osd/modules/osdwindow.h",
- MAME_DIR .. "src/osd/windows/winmain.cpp",
- MAME_DIR .. "src/osd/windows/winmain.h",
- MAME_DIR .. "src/osd/modules/render/drawnone.cpp",
- MAME_DIR .. "src/osd/modules/render/drawnone.h",
- MAME_DIR .. "src/osd/uwp/uwpcompat.cpp",
- MAME_DIR .. "src/osd/uwp/uwpcompat.h",
- MAME_DIR .. "src/osd/osdepend.h",
- }
-
-project ("ocore_" .. _OPTIONS["osd"])
- uuid (os.uuid("ocore_" .. _OPTIONS["osd"]))
- kind (LIBTYPE)
-
- removeflags {
- "SingleOutputDir",
- }
-
- dofile("uwp_cfg.lua")
-
- includedirs {
- MAME_DIR .. "3rdparty",
- MAME_DIR .. "src/emu",
- MAME_DIR .. "src/osd",
- MAME_DIR .. "src/osd/modules/file",
- MAME_DIR .. "src/lib",
- MAME_DIR .. "src/lib/util",
- }
-
- files {
- MAME_DIR .. "src/osd/osdcomm.h",
- MAME_DIR .. "src/osd/osdcore.cpp",
- MAME_DIR .. "src/osd/osdcore.h",
- MAME_DIR .. "src/osd/strconv.cpp",
- MAME_DIR .. "src/osd/strconv.h",
- MAME_DIR .. "src/osd/osdsync.cpp",
- MAME_DIR .. "src/osd/osdsync.h",
- MAME_DIR .. "src/osd/windows/winutil.cpp",
- MAME_DIR .. "src/osd/windows/winutil.h",
- MAME_DIR .. "src/osd/modules/osdmodule.cpp",
- MAME_DIR .. "src/osd/modules/osdmodule.h",
- MAME_DIR .. "src/osd/modules/file/winrtdir.cpp",
- MAME_DIR .. "src/osd/modules/file/winrtfile.cpp",
- MAME_DIR .. "src/osd/modules/file/winrtfile.h",
- MAME_DIR .. "src/osd/modules/file/winrtptty.cpp",
- MAME_DIR .. "src/osd/modules/file/winrtsocket.cpp",
- MAME_DIR .. "src/osd/modules/lib/osdlib_uwp.cpp",
- }
diff --git a/scripts/src/osd/uwp_cfg.lua b/scripts/src/osd/uwp_cfg.lua
deleted file mode 100644
index 28892656728..00000000000
--- a/scripts/src/osd/uwp_cfg.lua
+++ /dev/null
@@ -1,20 +0,0 @@
--- license:BSD-3-Clause
--- copyright-holders:MAMEdev Team
-
-defines {
- "OSD_UWP=1",
- "USE_QTDEBUG=0",
- "SDLMAME_NOASM=1",
- "USE_OPENGL=0",
- "NO_USE_MIDI=1",
- "WINVER=0x0603",
- "_WIN32_WINNT=0x0603",
- "NTDDI_VERSION=0x06030000",
- "MODERN_WIN_API",
- "WIN32_LEAN_AND_MEAN",
- "NOMINMAX",
-}
-
-flags {
- "Unicode",
-}
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index ecb3030c683..ac300261ce8 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -22,47 +22,25 @@ function maintargetosdoptions(_target,_subtarget)
configuration { }
- if _OPTIONS["DIRECTINPUT"] == "8" then
- links {
- "dinput8",
- }
- else
- links {
- "dinput",
- }
- end
-
-
if _OPTIONS["USE_SDL"] == "1" then
links {
- "SDL.dll",
+ "SDL2.dll",
}
end
links {
"comctl32",
"comdlg32",
- "psapi",
+ "dinput8",
"ole32",
+ "psapi",
"shlwapi",
+ "uuid",
}
end
newoption {
- trigger = "DIRECTINPUT",
- description = "Minimum DirectInput version to support",
- allowed = {
- { "7", "Support DirectInput 7 or later" },
- { "8", "Support DirectInput 8 or later" },
- },
-}
-
-if not _OPTIONS["DIRECTINPUT"] then
- _OPTIONS["DIRECTINPUT"] = "8"
-end
-
-newoption {
trigger = "USE_SDL",
description = "Enable SDL sound output",
allowed = {
@@ -124,18 +102,9 @@ project ("osd_" .. _OPTIONS["osd"])
defines {
"DIRECT3D_VERSION=0x0900",
+ "DIRECTINPUT_VERSION=0x0800",
}
- if _OPTIONS["DIRECTINPUT"] == "8" then
- defines {
- "DIRECTINPUT_VERSION=0x0800",
- }
- else
- defines {
- "DIRECTINPUT_VERSION=0x0700",
- }
- end
-
includedirs {
MAME_DIR .. "src/emu",
MAME_DIR .. "src/devices", -- accessing imagedev from debugger
@@ -151,25 +120,28 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/windows",
}
+ if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then
+ buildoptions_cpp {
+ "-Wno-ignored-attributes",-- many instances in ImGui
+ }
+ end
+
files {
MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp",
MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h",
MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.h",
MAME_DIR .. "src/osd/modules/render/drawd3d.cpp",
MAME_DIR .. "src/osd/modules/render/drawd3d.h",
- MAME_DIR .. "src/osd/modules/render/drawgdi.cpp",
- MAME_DIR .. "src/osd/modules/render/drawgdi.h",
- MAME_DIR .. "src/osd/modules/render/drawnone.cpp",
- MAME_DIR .. "src/osd/modules/render/drawnone.h",
MAME_DIR .. "src/osd/windows/video.cpp",
MAME_DIR .. "src/osd/windows/video.h",
MAME_DIR .. "src/osd/windows/window.cpp",
MAME_DIR .. "src/osd/windows/window.h",
MAME_DIR .. "src/osd/modules/osdwindow.cpp",
MAME_DIR .. "src/osd/modules/osdwindow.h",
- MAME_DIR .. "src/osd/windows/winmenu.cpp",
MAME_DIR .. "src/osd/windows/winmain.cpp",
MAME_DIR .. "src/osd/windows/winmain.h",
+ MAME_DIR .. "src/osd/windows/winopts.cpp",
+ MAME_DIR .. "src/osd/windows/winopts.h",
MAME_DIR .. "src/osd/osdepend.h",
MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.cpp",
MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.h",
@@ -227,13 +199,13 @@ project ("ocore_" .. _OPTIONS["osd"])
includedirs {
MAME_DIR .. "src/osd/windows",
- MAME_DIR .. "src/lib/winpcap",
}
files {
MAME_DIR .. "src/osd/eigccppc.h",
MAME_DIR .. "src/osd/eigccx86.h",
MAME_DIR .. "src/osd/eivc.h",
+ MAME_DIR .. "src/osd/eivcarm.h",
MAME_DIR .. "src/osd/eivcx86.h",
MAME_DIR .. "src/osd/eminline.h",
MAME_DIR .. "src/osd/osdcomm.h",
@@ -243,7 +215,6 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/strconv.h",
MAME_DIR .. "src/osd/osdsync.cpp",
MAME_DIR .. "src/osd/osdsync.h",
- MAME_DIR .. "src/osd/windows/main.cpp",
MAME_DIR .. "src/osd/windows/winutf8.cpp",
MAME_DIR .. "src/osd/windows/winutf8.h",
MAME_DIR .. "src/osd/windows/winutil.cpp",
diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua
index 2735e4df4f0..98893440f9f 100644
--- a/scripts/src/osd/windows_cfg.lua
+++ b/scripts/src/osd/windows_cfg.lua
@@ -3,16 +3,12 @@
defines {
"OSD_WINDOWS",
+ "UNICODE",
+ "_UNICODE",
"WIN32_LEAN_AND_MEAN",
"NOMINMAX",
}
-configuration { "mingw* or vs*" }
- defines {
- "UNICODE",
- "_UNICODE"
- }
-
configuration { "vs*" }
flags {
"Unicode",
@@ -33,16 +29,25 @@ if _OPTIONS["MODERN_WIN_API"]=="1" then
}
else
defines {
- "_WIN32_WINNT=0x0501",
+ "_WIN32_WINNT=0x0602",
+ "NTDDI_VERSION=0x06000000",
}
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