summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2019-04-25 09:41:49 -0400
committer GitHub <noreply@github.com>2019-04-25 09:41:49 -0400
commitd15ca02d0c3346dd12ef88d8c5462fa66994839e (patch)
tree79639ef92c135765f99637b2b7f12a95d88afda0 /scripts/src
parentefdaa09d5496df9768c825aebc8d7cc21edc9b7f (diff)
parent489087f17305887ad975a3a3dd4e3ae7ee986df7 (diff)
Merge pull request #4913 from kiall/default-enable-xinput
Enable Xinput by default
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/osd/sdl.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index c9a63dcb24e..0d5b72e21a6 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -170,7 +170,11 @@ newoption {
}
if not _OPTIONS["NO_USE_XINPUT"] then
- _OPTIONS["NO_USE_XINPUT"] = "1"
+ if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" then
+ _OPTIONS["NO_USE_XINPUT"] = "1"
+ else
+ _OPTIONS["NO_USE_XINPUT"] = "0"
+ end
end
newoption {