From 23bd2ecf6a467dbe4ef423bbbcd11d925fd9b12f Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 29 Jul 2021 15:22:51 +1000 Subject: Slightly cleaned up OSD input modules. Removed support for DirectInput 7 and earlier. It hasn't been tested in years, and it's not relevant on any supported OS. DirectInput is effectively finalised at version 8, and is unlikely to get an API update in the future. Use more string[_view] and fewer C strings, and tightened up scope of a few things. --- scripts/src/osd/windows.lua | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) (limited to 'scripts/src') diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index aa6b0241fb9..cefe6234cf3 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -22,17 +22,6 @@ 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", @@ -40,6 +29,7 @@ function maintargetosdoptions(_target,_subtarget) end links { + "dinput8", "comctl32", "comdlg32", "psapi", @@ -49,19 +39,6 @@ function maintargetosdoptions(_target,_subtarget) 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", @@ -124,18 +101,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 -- cgit v1.2.3-70-g09d2