summaryrefslogtreecommitdiffstats
path: root/scripts/src
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2021-07-29 15:22:51 +1000
committer Vas Crabb <vas@vastheman.com>2021-07-29 15:22:51 +1000
commit23bd2ecf6a467dbe4ef423bbbcd11d925fd9b12f (patch)
tree588dab0661ae554b76e595e7798a97de5c8b6dc9 /scripts/src
parentdb1ddb7ceeb5b99e32c21c090341be83bdf1530f (diff)
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.
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/osd/windows.lua36
1 files changed, 2 insertions, 34 deletions
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",
@@ -50,19 +40,6 @@ 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 +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