summaryrefslogtreecommitdiffstats
path: root/docs/release/scripts/src/osd
diff options
context:
space:
mode:
author Robbbert <pac0446@bigpond.net.au>2016-04-27 18:59:40 +1000
committer Robbbert <pac0446@bigpond.net.au>2016-04-27 18:59:40 +1000
commitbcd8558b02cb54eab92df98f14bf07221d6d358b (patch)
treec29211cecf250a791c074dfc3e1fc9a2d9a1a593 /docs/release/scripts/src/osd
parent0d70c1f8cdb9e66fd7bc5bcad128e394a2345607 (diff)
0.173 Release Fileshbmame173
Diffstat (limited to 'docs/release/scripts/src/osd')
-rw-r--r--docs/release/scripts/src/osd/modules.lua148
-rw-r--r--docs/release/scripts/src/osd/newui.lua76
-rw-r--r--docs/release/scripts/src/osd/sdl.lua305
-rw-r--r--docs/release/scripts/src/osd/sdl_cfg.lua46
-rw-r--r--docs/release/scripts/src/osd/windows.lua65
-rw-r--r--docs/release/scripts/src/osd/windows_cfg.lua2
-rw-r--r--docs/release/scripts/src/osd/winui.lua116
7 files changed, 383 insertions, 375 deletions
diff --git a/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua
index 1dfa4317a48..fef235457fe 100644
--- a/docs/release/scripts/src/osd/modules.lua
+++ b/docs/release/scripts/src/osd/modules.lua
@@ -10,7 +10,7 @@
---------------------------------------------------------------------------
function string.starts(String,Start)
- return string.sub(String,1,string.len(Start))==Start
+ return string.sub(String,1,string.len(Start))==Start
end
function addlibfromstring(str)
@@ -44,18 +44,25 @@ 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/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/diagnostics/diagnostics_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/debugint.cpp",
MAME_DIR .. "src/osd/modules/debugger/debugwin.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/debugimgui.cpp",
MAME_DIR .. "src/osd/modules/font/font_sdl.cpp",
MAME_DIR .. "src/osd/modules/font/font_windows.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_none.cpp",
MAME_DIR .. "src/osd/modules/netdev/taptun.cpp",
@@ -69,12 +76,58 @@ function osdmodulesbuild()
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/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_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_windows.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_windows.h",
+ 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/output/output_module.h",
+ MAME_DIR .. "src/osd/modules/output/none.cpp",
+ MAME_DIR .. "src/osd/modules/output/console.cpp",
+ MAME_DIR .. "src/osd/modules/output/network.cpp",
+ MAME_DIR .. "src/osd/modules/ipc/tcp_connection.cpp",
+ MAME_DIR .. "src/osd/modules/ipc/tcp_connection.h",
+ MAME_DIR .. "src/osd/modules/ipc/tcp_server.cpp",
+ MAME_DIR .. "src/osd/modules/ipc/tcp_server.h",
+ MAME_DIR .. "src/osd/modules/ipc/raw_tcp_connection.cpp",
+ MAME_DIR .. "src/osd/modules/ipc/raw_tcp_connection.h",
+ MAME_DIR .. "src/osd/modules/ipc/raw_tcp_server.cpp",
+ MAME_DIR .. "src/osd/modules/ipc/raw_tcp_server.h",
+ MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_connection.cpp",
+ MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_connection.h",
+ MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_server.cpp",
+ MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_server.h",
+ }
+ includedirs {
+ ext_includedir("uv"),
}
+ includedirs {
+ MAME_DIR .. "src/frontend/mame", -- for internal debugger
+ }
if _OPTIONS["targetos"]=="windows" then
includedirs {
MAME_DIR .. "3rdparty/winpcap/Include",
+ MAME_DIR .. "3rdparty/compat/mingw",
}
+
+ if _OPTIONS["MODERN_WIN_API"]~="1" then
+ includedirs {
+ MAME_DIR .. "3rdparty/compat/winsdk-override",
+ }
+ end
end
if _OPTIONS["NO_OPENGL"]=="1" then
@@ -100,36 +153,65 @@ function osdmodulesbuild()
end
end
+ defines {
+ "__STDC_LIMIT_MACROS",
+ "__STDC_FORMAT_MACROS",
+ "__STDC_CONSTANT_MACROS",
+ "IMGUI_DISABLE_OBSOLETE_FUNCTIONS",
+ }
+
files {
MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp",
+ MAME_DIR .. "src/osd/modules/render/aviwrite.cpp",
+ MAME_DIR .. "src/osd/modules/render/aviwrite.h",
+ MAME_DIR .. "src/osd/modules/render/bgfxutil.cpp",
+ 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/chain.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chainentry.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chainentryreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chainmanager.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chainreader.cpp",
+ 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/depthreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/effect.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/effectmanager.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/effectreader.cpp",
- MAME_DIR .. "src/osd/modules/render/bgfx/chain.cpp",
- MAME_DIR .. "src/osd/modules/render/bgfx/chainreader.cpp",
- MAME_DIR .. "src/osd/modules/render/bgfx/chainentry.cpp",
- MAME_DIR .. "src/osd/modules/render/bgfx/chainentryreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/entryuniformreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/inputpair.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/frameparameter.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/timeparameter.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/paramreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/paramuniform.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/paramuniformreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/shadermanager.cpp",
- MAME_DIR .. "src/osd/modules/render/bgfx/statereader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/slider.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/sliderreader.cpp",
- MAME_DIR .. "src/osd/modules/render/bgfx/parameter.cpp",
- MAME_DIR .. "src/osd/modules/render/bgfx/paramreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/slideruniform.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/slideruniformreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/statereader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/suppressor.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/suppressorreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/target.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/targetreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/targetmanager.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/texture.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/texturemanager.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/uniform.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/uniformreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/valueuniform.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/valueuniformreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/writereader.cpp",
}
includedirs {
+ MAME_DIR .. "3rdparty/bgfx/examples/common",
MAME_DIR .. "3rdparty/bgfx/include",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty",
MAME_DIR .. "3rdparty/bx/include",
MAME_DIR .. "3rdparty/rapidjson/include",
}
@@ -138,6 +220,10 @@ function osdmodulesbuild()
defines {
"NO_USE_MIDI",
}
+ else
+ includedirs {
+ ext_includedir("portmidi"),
+ }
end
if _OPTIONS["USE_QTDEBUG"]=="1" then
@@ -158,7 +244,7 @@ function qtdebuggerbuild()
removeflags {
"SingleOutputDir",
}
- local version = str_to_version(_OPTIONS["gcc_version"])
+ 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" }
if (version >= 30600) then
@@ -232,14 +318,14 @@ function qtdebuggerbuild()
custombuildtask {
- { MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.h", GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.h", GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.h", GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.h", GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.h", GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.h", GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.h", GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.h", GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.h", GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.h", GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.h", GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.h", GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.h", GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.h", GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
{ MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceinformationwindow.moc.cpp", { },{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
}
@@ -349,6 +435,7 @@ function osdmodulestargetconf()
"gdi32",
"dsound",
"dxguid",
+ "oleaut32",
}
elseif _OPTIONS["targetos"]=="macosx" then
links {
@@ -399,7 +486,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" or _OPTIONS["targetos"] == "os2" 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
_OPTIONS["NO_USE_MIDI"] = "1"
else
_OPTIONS["NO_USE_MIDI"] = "0"
@@ -416,29 +503,6 @@ newoption {
}
newoption {
- trigger = "USE_XAUDIO2",
- description = "Use XAudio2 API for audio",
- allowed = {
- { "0", "Disable XAudio2" },
- { "1", "Enable XAudio2" },
- },
-}
-
-if _OPTIONS["USE_XAUDIO2"]=="1" then
- _OPTIONS["MODERN_WIN_API"] = "1",
- defines {
- "USE_XAUDIO2=1",
- },
- includedirs {
- MAME_DIR .. "3rdparty/win81sdk/Include/um",
- }
-else
- defines {
- "USE_XAUDIO2=0",
- }
-end
-
-newoption {
trigger = "USE_QTDEBUG",
description = "Use QT debugger",
allowed = {
@@ -454,7 +518,7 @@ newoption {
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" or _OPTIONS["targetos"] == "os2" then
+ if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" then
_OPTIONS["USE_QTDEBUG"] = "0"
else
_OPTIONS["USE_QTDEBUG"] = "1"
diff --git a/docs/release/scripts/src/osd/newui.lua b/docs/release/scripts/src/osd/newui.lua
index c8451ed90a9..a5527ef4b0d 100644
--- a/docs/release/scripts/src/osd/newui.lua
+++ b/docs/release/scripts/src/osd/newui.lua
@@ -1,3 +1,14 @@
+-- license:BSD-3-Clause
+-- copyright-holders:Robbbert
+
+---------------------------------------------------------------------------
+--
+-- newui.lua
+--
+-- Rules for the building for Windows
+--
+---------------------------------------------------------------------------
+
dofile("modules.lua")
premake.make.linkoptions_after = false;
@@ -26,10 +37,12 @@ function maintargetosdoptions(_target,_subtarget)
"comctl32",
"comdlg32",
"psapi",
+ "ole32",
}
-- needs same resources as messui, because dropdown menus are in mameui.rc
override_resources = true;
+ rctarget = _subtarget;
local rcfile = MAME_DIR .. "src/osd/winui/" .. _subtarget .. ".rc"
local uifile = MAME_DIR .. "src/osd/winui/" .. _subtarget .. "ui.rc"
@@ -109,6 +122,7 @@ project ("osd_" .. _OPTIONS["osd"])
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",
}
@@ -118,32 +132,55 @@ project ("osd_" .. _OPTIONS["osd"])
}
files {
- MAME_DIR .. "src/osd/modules/render/drawd3d.cpp",
MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp",
+ MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h",
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/windows/input.cpp",
- MAME_DIR .. "src/osd/windows/output.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/winmain.cpp",
+ MAME_DIR .. "src/osd/windows/winmain.h",
+ MAME_DIR .. "src/osd/osdepend.h",
MAME_DIR .. "src/osd/winui/newui.cpp",
MAME_DIR .. "src/osd/windows/winmain.cpp",
MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/debugwininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/debugwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/disasmbasewininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/disasmbasewininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/disasmviewinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/disasmviewinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.h",
+ MAME_DIR .. "src/osd/modules/debugger/win/debugwin.h",
}
@@ -161,8 +198,10 @@ project ("ocore_" .. _OPTIONS["osd"])
dofile("windows_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",
}
@@ -177,30 +216,33 @@ project ("ocore_" .. _OPTIONS["osd"])
}
files {
+ MAME_DIR .. "src/osd/eigccppc.h",
+ MAME_DIR .. "src/osd/eigccx86.h",
+ MAME_DIR .. "src/osd/eivc.h",
+ MAME_DIR .. "src/osd/eivcx86.h",
+ MAME_DIR .. "src/osd/eminline.h",
+ 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/windows/main.cpp",
MAME_DIR .. "src/osd/windows/windir.cpp",
- MAME_DIR .. "src/osd/windows/winfile.cpp",
- MAME_DIR .. "src/osd/modules/sync/sync_windows.cpp",
+ MAME_DIR .. "src/osd/osdsync.cpp",
+ MAME_DIR .. "src/osd/osdsync.h",
MAME_DIR .. "src/osd/windows/winutf8.cpp",
+ MAME_DIR .. "src/osd/windows/winutf8.h",
MAME_DIR .. "src/osd/windows/winutil.cpp",
- MAME_DIR .. "src/osd/windows/winclip.cpp",
- MAME_DIR .. "src/osd/windows/winsocket.cpp",
- MAME_DIR .. "src/osd/windows/winptty.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/winfile.cpp",
+ 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/modules/lib/osdlib_win32.cpp",
}
- if _OPTIONS["NOASM"]=="1" then
- files {
- MAME_DIR .. "src/osd/modules/sync/work_mini.cpp",
- }
- else
- files {
- MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
- }
- end
--------------------------------------------------
diff --git a/docs/release/scripts/src/osd/sdl.lua b/docs/release/scripts/src/osd/sdl.lua
index 76947ad777a..d1a83229698 100644
--- a/docs/release/scripts/src/osd/sdl.lua
+++ b/docs/release/scripts/src/osd/sdl.lua
@@ -38,7 +38,7 @@ function maintargetosdoptions(_target,_subtarget)
}
end
- if BASE_TARGETOS=="unix" and _OPTIONS["targetos"]~="macosx" then
+ if BASE_TARGETOS=="unix" and _OPTIONS["targetos"]~="macosx" and _OPTIONS["targetos"]~="android" then
links {
"SDL2_ttf",
}
@@ -48,35 +48,53 @@ function maintargetosdoptions(_target,_subtarget)
end
if _OPTIONS["targetos"]=="windows" then
- if _OPTIONS["USE_LIBSDL"]~="1" then
+ if _OPTIONS["with-bundled-sdl2"]~=nil then
configuration { "mingw*"}
links {
- "SDL2.dll",
- }
- configuration { "x64","vs*" }
- libdirs {
- MAME_DIR .. "3rdparty/sdl2/lib/x64",
- }
- configuration { "x32","vs*" }
- libdirs {
- MAME_DIR .. "3rdparty/sdl2/lib/x86",
+ "SDL2",
+ "Imm32",
+ "Version",
+ "Ole32",
+ "OleAut32",
}
-
- configuration { "vs*"}
+ configuration { "vs*" }
links {
"SDL2",
+ "Imm32",
+ "Version",
}
configuration { }
else
- local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
- addlibfromstring(str)
- addoptionsfromstring(str)
+ if _OPTIONS["USE_LIBSDL"]~="1" then
+ configuration { "mingw*"}
+ links {
+ "SDL2.dll",
+ }
+ 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")
+ }
end
links {
"psapi",
}
-
- configuration { "mingw*-gcc" }
+ configuration { "mingw*" }
linkoptions{
"-municode",
}
@@ -84,14 +102,6 @@ function maintargetosdoptions(_target,_subtarget)
flags {
"Unicode",
}
- 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 {}
elseif _OPTIONS["targetos"]=="haiku" then
links {
@@ -105,8 +115,16 @@ function maintargetosdoptions(_target,_subtarget)
links {
"psapi"
}
-
configuration { }
+
+ if _OPTIONS["targetos"]=="macosx" then
+ if _OPTIONS["with-bundled-sdl2"]~=nil then
+ links {
+ "SDL2",
+ }
+ end
+ end
+
end
@@ -127,8 +145,8 @@ newoption {
}
newoption {
- trigger = "SDL_INI_PATH",
- description = "Default search path for .ini files",
+ trigger = "SDL_INI_PATH",
+ description = "Default search path for .ini files",
}
newoption {
@@ -141,7 +159,7 @@ newoption {
}
if not _OPTIONS["NO_X11"] then
- if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" or _OPTIONS["targetos"]=="os2" then
+ if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" then
_OPTIONS["NO_X11"] = "1"
else
_OPTIONS["NO_X11"] = "0"
@@ -204,34 +222,28 @@ end
BASE_TARGETOS = "unix"
SDLOS_TARGETOS = "unix"
-SYNC_IMPLEMENTATION = "tc"
SDL_NETWORK = ""
if _OPTIONS["targetos"]=="linux" then
SDL_NETWORK = "taptun"
elseif _OPTIONS["targetos"]=="openbsd" then
- SYNC_IMPLEMENTATION = "ntc"
elseif _OPTIONS["targetos"]=="netbsd" then
- SYNC_IMPLEMENTATION = "ntc"
SDL_NETWORK = "pcap"
elseif _OPTIONS["targetos"]=="haiku" then
- SYNC_IMPLEMENTATION = "ntc"
elseif _OPTIONS["targetos"]=="asmjs" then
- SYNC_IMPLEMENTATION = "mini"
elseif _OPTIONS["targetos"]=="windows" then
BASE_TARGETOS = "win32"
SDLOS_TARGETOS = "win32"
- SYNC_IMPLEMENTATION = "windows"
SDL_NETWORK = "pcap"
elseif _OPTIONS["targetos"]=="macosx" then
SDLOS_TARGETOS = "macosx"
- SYNC_IMPLEMENTATION = "ntc"
SDL_NETWORK = "pcap"
-elseif _OPTIONS["targetos"]=="os2" then
- BASE_TARGETOS = "os2"
- SDLOS_TARGETOS = "os2"
- SYNC_IMPLEMENTATION = "os2"
end
+if _OPTIONS["with-bundled-sdl2"]~=nil or _OPTIONS["targetos"]=="android" 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"))
@@ -243,22 +255,35 @@ if BASE_TARGETOS=="unix" then
"-framework QuartzCore",
"-framework OpenGL",
}
+
+
if os_version>=101100 then
linkoptions {
"-weak_framework Metal",
}
end
- if _OPTIONS["USE_LIBSDL"]~="1" then
+ if _OPTIONS["with-bundled-sdl2"]~=nil then
linkoptions {
- "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
- }
- links {
- "SDL2.framework",
+ "-framework AudioUnit",
+ "-framework CoreAudio",
+ "-framework Carbon",
+ "-framework ForceFeedback",
+ "-framework IOKit",
+ "-framework CoreVideo",
}
else
- local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'")
- addlibfromstring(str)
- addoptionsfromstring(str)
+ 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
end
else
if _OPTIONS["NO_X11"]=="1" then
@@ -270,10 +295,17 @@ if BASE_TARGETOS=="unix" then
"/usr/openwin/lib",
}
end
- local str = backtick(sdlconfigcmd() .. " --libs")
- addlibfromstring(str)
- addoptionsfromstring(str)
- if _OPTIONS["targetos"]~="haiku" then
+ if _OPTIONS["with-bundled-sdl2"]~=nil and _OPTIONS["targetos"]~="android" then
+ links {
+ "SDL2",
+ }
+ else
+ local str = backtick(sdlconfigcmd() .. " --libs")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
+ end
+
+ if _OPTIONS["targetos"]~="haiku" and _OPTIONS["targetos"]~="android" then
links {
"m",
"pthread",
@@ -290,13 +322,6 @@ if BASE_TARGETOS=="unix" then
end
end
end
-elseif BASE_TARGETOS=="os2" then
- local str = backtick(sdlconfigcmd() .. " --libs")
- addlibfromstring(str)
- addoptionsfromstring(str)
- links {
- "pthread"
- }
end
project ("qtdbg_" .. _OPTIONS["osd"])
@@ -335,6 +360,7 @@ project ("osd_" .. _OPTIONS["osd"])
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",
MAME_DIR .. "src/osd/sdl",
@@ -342,7 +368,7 @@ project ("osd_" .. _OPTIONS["osd"])
if _OPTIONS["targetos"]=="windows" then
files {
- MAME_DIR .. "src/osd/sdl/main.cpp",
+ MAME_DIR .. "src/osd/windows/main.cpp",
}
end
@@ -393,17 +419,12 @@ project ("osd_" .. _OPTIONS["osd"])
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/input.cpp",
- MAME_DIR .. "src/osd/sdl/input.h",
MAME_DIR .. "src/osd/sdl/video.cpp",
MAME_DIR .. "src/osd/sdl/video.h",
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/sdl/output.cpp",
- MAME_DIR .. "src/osd/sdl/watchdog.cpp",
- MAME_DIR .. "src/osd/sdl/watchdog.h",
MAME_DIR .. "src/osd/modules/render/drawsdl.cpp",
}
files {
@@ -436,153 +457,37 @@ project ("ocore_" .. _OPTIONS["osd"])
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/sdl/sdldir.cpp",
- MAME_DIR .. "src/osd/sdl/sdlfile.cpp",
- MAME_DIR .. "src/osd/sdl/sdlfile.h",
- MAME_DIR .. "src/osd/sdl/sdlptty_" .. BASE_TARGETOS ..".cpp",
- MAME_DIR .. "src/osd/sdl/sdlsocket.cpp",
- MAME_DIR .. "src/osd/sdl/sdlos_" .. SDLOS_TARGETOS .. ".cpp",
MAME_DIR .. "src/osd/modules/osdmodule.cpp",
MAME_DIR .. "src/osd/modules/osdmodule.h",
MAME_DIR .. "src/osd/modules/lib/osdlib_" .. SDLOS_TARGETOS .. ".cpp",
MAME_DIR .. "src/osd/modules/lib/osdlib.h",
- MAME_DIR .. "src/osd/modules/sync/sync_" .. SYNC_IMPLEMENTATION .. ".cpp",
- MAME_DIR .. "src/osd/modules/sync/osdsync.h",
}
- if _OPTIONS["NOASM"]=="1" then
- files {
- MAME_DIR .. "src/osd/modules/sync/work_mini.cpp",
- }
- else
+ if BASE_TARGETOS=="unix" then
files {
- MAME_DIR .. "src/osd/modules/sync/work_osd.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",
+ MAME_DIR .. "src/osd/modules/file/posixsocket.cpp",
}
- end
-
- if _OPTIONS["targetos"]=="macosx" then
- files {
- MAME_DIR .. "src/osd/sdl/osxutils.h",
- MAME_DIR .. "src/osd/sdl/osxutils.mm",
- }
- end
-
-
---------------------------------------------------
--- testkeys
---------------------------------------------------
-
-if _OPTIONS["with-tools"] then
- project("testkeys")
- uuid ("744cec21-c3b6-4d69-93cb-6811fed0ffe3")
- kind "ConsoleApp"
-
- flags {
- "Symbols", -- always include minimum symbols for executables
- }
-
- dofile("sdl_cfg.lua")
-
+ elseif BASE_TARGETOS=="win32" then
includedirs {
- MAME_DIR .. "src/osd",
- MAME_DIR .. "src/lib/util",
- }
-
- if _OPTIONS["SEPARATE_BIN"]~="1" then
- targetdir(MAME_DIR)
- end
-
- links {
- "utils",
- "ocore_" .. _OPTIONS["osd"],
+ MAME_DIR .. "src/osd/windows",
}
-
files {
- MAME_DIR .. "src/osd/sdl/testkeys.cpp",
+ MAME_DIR .. "src/osd/modules/file/winfile.cpp",
+ 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
}
-
- if _OPTIONS["targetos"] == "windows" then
- if _OPTIONS["USE_LIBSDL"]~="1" then
- configuration { "mingw*"}
- links {
- "SDL2.dll",
- }
- configuration { "x64","vs*" }
- libdirs {
- MAME_DIR .. "3rdparty/sdl2/lib/x64",
- }
- configuration { "x32","vs*" }
- libdirs {
- MAME_DIR .. "3rdparty/sdl2/lib/x86",
- }
- configuration { "vs*"}
- links {
- "SDL2",
- }
- configuration { }
- else
- local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
- addlibfromstring(str)
- addoptionsfromstring(str)
- end
- links {
- "psapi",
- }
- linkoptions{
- "-municode",
- }
- files {
- MAME_DIR .. "src/osd/sdl/main.cpp",
- }
- end
-
- configuration { "mingw*" or "vs*" }
- targetextension ".exe"
-
- configuration { }
-
- strip()
-end
-
-
---------------------------------------------------
--- aueffectutil
---------------------------------------------------
-
-if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then
- project("aueffectutil")
- uuid ("3db8316d-fad7-4f5b-b46a-99373c91550e")
- kind "ConsoleApp"
-
- flags {
- "Symbols", -- always include minimum symbols for executables
- }
-
- dofile("sdl_cfg.lua")
-
- if _OPTIONS["SEPARATE_BIN"]~="1" then
- targetdir(MAME_DIR)
- end
-
- linkoptions {
- "-sectcreate __TEXT __info_plist " .. MAME_DIR .. "src/osd/sdl/aueffectutil-Info.plist",
- }
-
- dependency {
- { "aueffectutil", MAME_DIR .. "src/osd/sdl/aueffectutil-Info.plist", true },
- }
-
- links {
- "AudioUnit.framework",
- "AudioToolbox.framework",
- "CoreAudio.framework",
- "CoreAudioKit.framework",
- "CoreServices.framework",
- }
-
+ else
files {
- MAME_DIR .. "src/osd/sdl/aueffectutil.mm",
+ MAME_DIR .. "src/osd/modules/file/stdfile.cpp",
}
+ end
+
- strip()
-end
diff --git a/docs/release/scripts/src/osd/sdl_cfg.lua b/docs/release/scripts/src/osd/sdl_cfg.lua
index e3a6f913e75..0fd15e5ca27 100644
--- a/docs/release/scripts/src/osd/sdl_cfg.lua
+++ b/docs/release/scripts/src/osd/sdl_cfg.lua
@@ -19,9 +19,9 @@ if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS[
end
if _OPTIONS["SDL_INI_PATH"]~=nil then
- defines {
- "'INI_PATH=\"" .. _OPTIONS["SDL_INI_PATH"] .. "\"'",
- }
+ defines {
+ "'INI_PATH=\"" .. _OPTIONS["SDL_INI_PATH"] .. "\"'",
+ }
end
if _OPTIONS["NO_X11"]=="1" then
@@ -67,7 +67,6 @@ end
defines {
"OSD_SDL",
- "SYNC_IMPLEMENTATION=" .. SYNC_IMPLEMENTATION,
}
if BASE_TARGETOS=="unix" then
@@ -75,18 +74,20 @@ if BASE_TARGETOS=="unix" then
"SDLMAME_UNIX",
}
if _OPTIONS["targetos"]=="macosx" then
- if _OPTIONS["USE_LIBSDL"]~="1" then
- buildoptions {
- "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
- }
- else
- defines {
- "MACOSX_USE_LIBSDL",
- }
- buildoptions {
- backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"),
- }
- end
+ 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:/SDL::'"),
+ }
+ end
+ end
else
buildoptions {
backtick(sdlconfigcmd() .. " --cflags"),
@@ -100,7 +101,7 @@ if BASE_TARGETOS=="unix" then
end
if _OPTIONS["targetos"]=="windows" then
- configuration { "mingw*-gcc or vs*" }
+ configuration { "mingw* or vs*" }
defines {
"UNICODE",
"_UNICODE",
@@ -111,10 +112,6 @@ if _OPTIONS["targetos"]=="windows" then
defines {
"MALLOC_DEBUG",
}
- configuration { "vs*" }
- includedirs {
- MAME_DIR .. "3rdparty/sdl2/include",
- }
configuration { }
elseif _OPTIONS["targetos"]=="linux" then
@@ -137,13 +134,6 @@ elseif _OPTIONS["targetos"]=="freebsd" then
-- /usr/local/include is not considered a system include director on FreeBSD. GL.h resides there and throws warnings
"-isystem /usr/local/include",
}
-elseif _OPTIONS["targetos"]=="os2" then
- defines {
- "SDLMAME_OS2",
- }
- buildoptions {
- backtick(sdlconfigcmd() .. " --cflags"),
- }
end
configuration { "osx*" }
diff --git a/docs/release/scripts/src/osd/windows.lua b/docs/release/scripts/src/osd/windows.lua
index 154d4732bc1..b4be2dc7ce4 100644
--- a/docs/release/scripts/src/osd/windows.lua
+++ b/docs/release/scripts/src/osd/windows.lua
@@ -15,7 +15,7 @@ dofile("modules.lua")
function maintargetosdoptions(_target,_subtarget)
osdmodulestargetconf()
- configuration { "mingw*-gcc" }
+ configuration { "mingw*" }
linkoptions {
"-municode",
}
@@ -46,6 +46,7 @@ function maintargetosdoptions(_target,_subtarget)
"comctl32",
"comdlg32",
"psapi",
+ "ole32",
}
end
@@ -143,6 +144,7 @@ project ("osd_" .. _OPTIONS["osd"])
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",
}
@@ -163,10 +165,6 @@ project ("osd_" .. _OPTIONS["osd"])
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/input.cpp",
- MAME_DIR .. "src/osd/windows/input.h",
- MAME_DIR .. "src/osd/windows/output.cpp",
- MAME_DIR .. "src/osd/windows/output.h",
MAME_DIR .. "src/osd/windows/video.cpp",
MAME_DIR .. "src/osd/windows/video.h",
MAME_DIR .. "src/osd/windows/window.cpp",
@@ -218,15 +216,16 @@ project ("ocore_" .. _OPTIONS["osd"])
dofile("windows_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",
}
BASE_TARGETOS = "win32"
SDLOS_TARGETOS = "win32"
- SYNC_IMPLEMENTATION = "windows"
includedirs {
MAME_DIR .. "src/osd/windows",
@@ -244,61 +243,19 @@ project ("ocore_" .. _OPTIONS["osd"])
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/main.cpp",
MAME_DIR .. "src/osd/windows/windir.cpp",
- MAME_DIR .. "src/osd/windows/winfile.cpp",
- MAME_DIR .. "src/osd/modules/sync/sync_windows.cpp",
- MAME_DIR .. "src/osd/modules/sync/osdsync.h",
MAME_DIR .. "src/osd/windows/winutf8.cpp",
MAME_DIR .. "src/osd/windows/winutf8.h",
MAME_DIR .. "src/osd/windows/winutil.cpp",
MAME_DIR .. "src/osd/windows/winutil.h",
- MAME_DIR .. "src/osd/windows/winfile.h",
- MAME_DIR .. "src/osd/windows/winclip.cpp",
- MAME_DIR .. "src/osd/windows/winsocket.cpp",
- MAME_DIR .. "src/osd/windows/winptty.cpp",
MAME_DIR .. "src/osd/modules/osdmodule.cpp",
MAME_DIR .. "src/osd/modules/osdmodule.h",
+ MAME_DIR .. "src/osd/modules/file/winfile.cpp",
+ 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/modules/lib/osdlib_win32.cpp",
}
-
- if _OPTIONS["NOASM"] == "1" then
- files {
- MAME_DIR .. "src/osd/modules/sync/work_mini.cpp",
- }
- else
- files {
- MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
- }
- end
-
-
---------------------------------------------------
--- ledutil
---------------------------------------------------
-
-if _OPTIONS["with-tools"] then
- project("ledutil")
- uuid ("061293ca-7290-44ac-b2b5-5913ae8dc9c0")
- kind "ConsoleApp"
-
- flags {
- "Symbols", -- always include minimum symbols for executables
- }
-
- if _OPTIONS["SEPARATE_BIN"]~="1" then
- targetdir(MAME_DIR)
- end
-
- links {
- "ocore_" .. _OPTIONS["osd"],
- }
-
- includedirs {
- MAME_DIR .. "src/osd",
- }
-
- files {
- MAME_DIR .. "src/osd/windows/ledutil.cpp",
- }
-end
diff --git a/docs/release/scripts/src/osd/windows_cfg.lua b/docs/release/scripts/src/osd/windows_cfg.lua
index 3e656017816..b7636e5b435 100644
--- a/docs/release/scripts/src/osd/windows_cfg.lua
+++ b/docs/release/scripts/src/osd/windows_cfg.lua
@@ -5,7 +5,7 @@ defines {
"OSD_WINDOWS",
}
-configuration { "mingw*-gcc or vs*" }
+configuration { "mingw* or vs*" }
defines {
"UNICODE",
"_UNICODE",
diff --git a/docs/release/scripts/src/osd/winui.lua b/docs/release/scripts/src/osd/winui.lua
index cff0beea684..263e4f42a74 100644
--- a/docs/release/scripts/src/osd/winui.lua
+++ b/docs/release/scripts/src/osd/winui.lua
@@ -1,3 +1,14 @@
+-- license:BSD-3-Clause
+-- copyright-holders:Robbbert
+
+---------------------------------------------------------------------------
+--
+-- winui.lua
+--
+-- Rules for the building for Windows
+--
+---------------------------------------------------------------------------
+
dofile("modules.lua")
premake.make.linkoptions_after = false;
@@ -48,11 +59,13 @@ function maintargetosdoptions(_target,_subtarget)
"comctl32",
"comdlg32",
"psapi",
+ "ole32",
}
-- Local file gives correct icon in mame instance inside of mameui
-- Local file must #include mameui.rc
override_resources = true;
+ rctarget = _target;
local rcfile = MAME_DIR .. "src/osd/winui/" .. _target .. ".rc"
local uifile = MAME_DIR .. "src/osd/winui/" .. _target .. "ui.rc"
@@ -132,6 +145,7 @@ project ("osd_" .. _OPTIONS["osd"])
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",
}
@@ -141,60 +155,84 @@ project ("osd_" .. _OPTIONS["osd"])
}
files {
- MAME_DIR .. "src/osd/modules/render/drawd3d.cpp",
MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp",
+ MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h",
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/windows/input.cpp",
- MAME_DIR .. "src/osd/windows/output.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/winmain.cpp",
+ MAME_DIR .. "src/osd/windows/winmain.h",
+ MAME_DIR .. "src/osd/osdepend.h",
-- MAME_DIR .. "src/osd/windows/winmenu.cpp",
MAME_DIR .. "src/osd/winui/newui.cpp",
MAME_DIR .. "src/osd/windows/winmain.cpp",
MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/debugwininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/debugwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/disasmbasewininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/disasmbasewininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/disasmviewinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/disasmviewinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.cpp",
- MAME_DIR .. "src/osd/winui/win_options.cpp",
- MAME_DIR .. "src/osd/winui/mui_util.cpp",
- MAME_DIR .. "src/osd/winui/directinput.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.h",
+ MAME_DIR .. "src/osd/modules/debugger/win/debugwin.h",
+ MAME_DIR .. "src/osd/winui/bitmask.cpp",
+ MAME_DIR .. "src/osd/winui/columnedit.cpp",
+ MAME_DIR .. "src/osd/winui/datafile.cpp",
+ MAME_DIR .. "src/osd/winui/datamap.cpp",
+ MAME_DIR .. "src/osd/winui/dialogs.cpp",
MAME_DIR .. "src/osd/winui/dijoystick.cpp",
MAME_DIR .. "src/osd/winui/directdraw.cpp",
+ MAME_DIR .. "src/osd/winui/directinput.cpp",
MAME_DIR .. "src/osd/winui/directories.cpp",
- MAME_DIR .. "src/osd/winui/mui_audit.cpp",
- MAME_DIR .. "src/osd/winui/columnedit.cpp",
- MAME_DIR .. "src/osd/winui/screenshot.cpp",
- MAME_DIR .. "src/osd/winui/treeview.cpp",
- MAME_DIR .. "src/osd/winui/splitters.cpp",
- MAME_DIR .. "src/osd/winui/bitmask.cpp",
- MAME_DIR .. "src/osd/winui/datamap.cpp",
+ MAME_DIR .. "src/osd/winui/dirwatch.cpp",
MAME_DIR .. "src/osd/winui/dxdecode.cpp",
- MAME_DIR .. "src/osd/winui/picker.cpp",
- MAME_DIR .. "src/osd/winui/properties.cpp",
- MAME_DIR .. "src/osd/winui/tabview.cpp",
MAME_DIR .. "src/osd/winui/help.cpp",
+ MAME_DIR .. "src/osd/winui/helpids.cpp",
MAME_DIR .. "src/osd/winui/history.cpp",
- MAME_DIR .. "src/osd/winui/dialogs.cpp",
- MAME_DIR .. "src/osd/winui/mui_opts.cpp",
MAME_DIR .. "src/osd/winui/layout.cpp",
- MAME_DIR .. "src/osd/winui/datafile.cpp",
- MAME_DIR .. "src/osd/winui/dirwatch.cpp",
- MAME_DIR .. "src/osd/winui/winui.cpp",
- MAME_DIR .. "src/osd/winui/helpids.cpp",
+ MAME_DIR .. "src/osd/winui/mui_audit.cpp",
MAME_DIR .. "src/osd/winui/mui_main.cpp",
+ MAME_DIR .. "src/osd/winui/mui_opts.cpp",
+ MAME_DIR .. "src/osd/winui/mui_util.cpp",
+ MAME_DIR .. "src/osd/winui/picker.cpp",
+ MAME_DIR .. "src/osd/winui/properties.cpp",
+ MAME_DIR .. "src/osd/winui/resource.h",
+ MAME_DIR .. "src/osd/winui/screenshot.cpp",
+ MAME_DIR .. "src/osd/winui/splitters.cpp",
+ MAME_DIR .. "src/osd/winui/tabview.cpp",
+ MAME_DIR .. "src/osd/winui/treeview.cpp",
+ MAME_DIR .. "src/osd/winui/winui.cpp",
+ MAME_DIR .. "src/osd/winui/win_options.cpp",
}
project ("ocore_" .. _OPTIONS["osd"])
@@ -211,8 +249,10 @@ project ("ocore_" .. _OPTIONS["osd"])
dofile("windows_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",
}
@@ -227,18 +267,30 @@ project ("ocore_" .. _OPTIONS["osd"])
}
files {
+ MAME_DIR .. "src/osd/eigccppc.h",
+ MAME_DIR .. "src/osd/eigccx86.h",
+ MAME_DIR .. "src/osd/eivc.h",
+ MAME_DIR .. "src/osd/eivcx86.h",
+ MAME_DIR .. "src/osd/eminline.h",
+ 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/windows/main.cpp",
MAME_DIR .. "src/osd/windows/windir.cpp",
- MAME_DIR .. "src/osd/windows/winfile.cpp",
- MAME_DIR .. "src/osd/modules/sync/sync_windows.cpp",
+ MAME_DIR .. "src/osd/osdsync.cpp",
+ MAME_DIR .. "src/osd/osdsync.h",
MAME_DIR .. "src/osd/windows/winutf8.cpp",
+ MAME_DIR .. "src/osd/windows/winutf8.h",
MAME_DIR .. "src/osd/windows/winutil.cpp",
- MAME_DIR .. "src/osd/windows/winclip.cpp",
- MAME_DIR .. "src/osd/windows/winsocket.cpp",
- MAME_DIR .. "src/osd/windows/winptty.cpp",
+ MAME_DIR .. "src/osd/windows/winutil.h",
MAME_DIR .. "src/osd/modules/osdmodule.cpp",
- MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
+ MAME_DIR .. "src/osd/modules/osdmodule.h",
+ MAME_DIR .. "src/osd/modules/file/winfile.cpp",
+ 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/modules/lib/osdlib_win32.cpp",
}
@@ -252,11 +304,9 @@ if _OPTIONS["with-tools"] then
uuid ("061293ca-7290-44ac-b2b5-5913ae8dc9c0")
kind "ConsoleApp"
- options {
- "ForceCPP",
- }
-
- targetdir(MAME_DIR)
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
+ targetdir(MAME_DIR)
+ end
links {
"ocore_" .. _OPTIONS["osd"],