summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author Brad Hughes <bradhugh@outlook.com>2016-02-29 21:59:56 -0500
committer Brad Hughes <bradhugh@outlook.com>2016-02-29 21:59:56 -0500
commit3b0d8b1efb51663a55140d0b743f9d1b19c86d7b (patch)
tree471ad8b0e9dd36ff3205aa6981441a19769f4f69 /scripts
parent6436c3f8c4b89bd2c818d7c3150acda3558a6ccd (diff)
parent5cc9973a0aec22600ba118eb60a1603c7d471ee4 (diff)
Merge branch 'xinput_local_temp1' of E:\mame\bradhugh.mame\mame
Diffstat (limited to 'scripts')
-rw-r--r--scripts/src/osd/modules.lua1
-rw-r--r--scripts/src/osd/windows.lua1
2 files changed, 2 insertions, 0 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 6be181c46a8..18a709784f8 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -82,6 +82,7 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/input/input_x11.cpp",
MAME_DIR .. "src/osd/modules/input/input_windows.cpp",
MAME_DIR .. "src/osd/modules/input/input_windows.h",
+ MAME_DIR .. "src/osd/modules/input/input_xinput.cpp",
}
if _OPTIONS["targetos"]=="windows" then
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 950e15d1e46..7ff677eb1ba 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -46,6 +46,7 @@ function maintargetosdoptions(_target,_subtarget)
"comctl32",
"comdlg32",
"psapi",
+ "xinput",
}
end