diff options
Diffstat (limited to 'docs/release/scripts/src/osd')
-rw-r--r-- | docs/release/scripts/src/osd/modules.lua | 29 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/sdl.lua | 3 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/sdl_cfg.lua | 2 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/uwp_cfg.lua | 2 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/windows_cfg.lua | 2 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/winui.lua | 2 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/winui_cfg.lua | 2 |
7 files changed, 39 insertions, 3 deletions
diff --git a/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua index a863cd360b9..9ca2bcaa196 100644 --- a/docs/release/scripts/src/osd/modules.lua +++ b/docs/release/scripts/src/osd/modules.lua @@ -80,6 +80,7 @@ function osdmodulesbuild() 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", @@ -122,6 +123,7 @@ function osdmodulesbuild() includedirs { MAME_DIR .. "3rdparty/winpcap/Include", MAME_DIR .. "3rdparty/compat/mingw", + MAME_DIR .. "3rdparty/portaudio/include", } includedirs { @@ -215,6 +217,16 @@ function osdmodulesbuild() MAME_DIR .. "3rdparty/rapidjson/include", } + if _OPTIONS["NO_USE_PORTAUDIO"]=="1" then + defines { + "NO_USE_PORTAUDIO", + } + else + includedirs { + ext_includedir("portaudio"), + } + end + if _OPTIONS["NO_USE_MIDI"]=="1" then defines { "NO_USE_MIDI", @@ -494,6 +506,23 @@ if not _OPTIONS["NO_USE_MIDI"] then end newoption { + trigger = "NO_USE_PORTAUDIO", + description = "Disable PortAudio interface", + allowed = { + { "0", "Enable PortAudio" }, + { "1", "Disable PortAudio" }, + }, +} + +if not _OPTIONS["NO_USE_PORTAUDIO"] then + if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="linux" or _OPTIONS["targetos"]=="macosx" then + _OPTIONS["NO_USE_PORTAUDIO"] = "0" + else + _OPTIONS["NO_USE_PORTAUDIO"] = "1" + end +end + +newoption { trigger = "MODERN_WIN_API", description = "Use Modern Windows APIs", allowed = { diff --git a/docs/release/scripts/src/osd/sdl.lua b/docs/release/scripts/src/osd/sdl.lua index af6ff1b98ce..5970f6d3334 100644 --- a/docs/release/scripts/src/osd/sdl.lua +++ b/docs/release/scripts/src/osd/sdl.lua @@ -113,7 +113,8 @@ function maintargetosdoptions(_target,_subtarget) configuration { "mingw*" or "vs*" } targetprefix "sdl" links { - "psapi" + "psapi", + "Ole32", } configuration { } diff --git a/docs/release/scripts/src/osd/sdl_cfg.lua b/docs/release/scripts/src/osd/sdl_cfg.lua index b8f24d27d3b..3f8e3e10bbc 100644 --- a/docs/release/scripts/src/osd/sdl_cfg.lua +++ b/docs/release/scripts/src/osd/sdl_cfg.lua @@ -109,6 +109,8 @@ if _OPTIONS["targetos"]=="windows" then "_UNICODE", "main=utf8_main", "_WIN32_WINNT=0x0501", + "WIN32_LEAN_AND_MEAN", + "NOMINMAX", } configuration { } diff --git a/docs/release/scripts/src/osd/uwp_cfg.lua b/docs/release/scripts/src/osd/uwp_cfg.lua index 234327aada0..28892656728 100644 --- a/docs/release/scripts/src/osd/uwp_cfg.lua +++ b/docs/release/scripts/src/osd/uwp_cfg.lua @@ -11,6 +11,8 @@ defines { "_WIN32_WINNT=0x0603", "NTDDI_VERSION=0x06030000", "MODERN_WIN_API", + "WIN32_LEAN_AND_MEAN", + "NOMINMAX", } flags { diff --git a/docs/release/scripts/src/osd/windows_cfg.lua b/docs/release/scripts/src/osd/windows_cfg.lua index 1ba0efe6151..1baa45f4255 100644 --- a/docs/release/scripts/src/osd/windows_cfg.lua +++ b/docs/release/scripts/src/osd/windows_cfg.lua @@ -3,6 +3,8 @@ defines { "OSD_WINDOWS", + "WIN32_LEAN_AND_MEAN", + "NOMINMAX", } configuration { "mingw* or vs*" } diff --git a/docs/release/scripts/src/osd/winui.lua b/docs/release/scripts/src/osd/winui.lua index 76b6902145b..8cfdd0408e2 100644 --- a/docs/release/scripts/src/osd/winui.lua +++ b/docs/release/scripts/src/osd/winui.lua @@ -204,7 +204,6 @@ project ("osd_" .. _OPTIONS["osd"]) 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", @@ -229,7 +228,6 @@ project ("osd_" .. _OPTIONS["osd"]) 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"]) diff --git a/docs/release/scripts/src/osd/winui_cfg.lua b/docs/release/scripts/src/osd/winui_cfg.lua index 5dcaaaf0348..9c5cb9b3778 100644 --- a/docs/release/scripts/src/osd/winui_cfg.lua +++ b/docs/release/scripts/src/osd/winui_cfg.lua @@ -7,6 +7,8 @@ defines { "main=utf8_main", "_WIN32_WINNT=0x0501", "USE_QTDEBUG=0", + "WIN32_LEAN_AND_MEAN", + "NOMINMAX", } configuration { "vs*" } |