From 88412da8626ae505b0215226bb0cf78e013a1d4f Mon Sep 17 00:00:00 2001 From: Brad Hughes Date: Sat, 5 Mar 2016 15:02:52 -0500 Subject: Make XAudio2 available in all Windows OSD builds, plus use 2.9 if available, plus code cleanup. --- scripts/src/osd/modules.lua | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) (limited to 'scripts/src/osd/modules.lua') diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 1468ac6faca..1638cbfd8d0 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -86,6 +86,11 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/input/input_xinput.cpp", } + configuration { "mingw*"} + includedirs { + MAME_DIR .. "3rdparty/compat/mingw", + } + if _OPTIONS["targetos"]=="windows" then includedirs { MAME_DIR .. "3rdparty/winpcap/Include", @@ -431,31 +436,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", - }, - configuration { "mingw*"} - includedirs { - MAME_DIR .. "3rdparty/compat/mingw", - } - configuration { } -else - defines { - "USE_XAUDIO2=0", - } -end - newoption { trigger = "USE_QTDEBUG", description = "Use QT debugger", -- cgit v1.2.3-70-g09d2