summaryrefslogtreecommitdiff
path: root/src/setup
diff options
context:
space:
mode:
authorSimon Howard2015-04-11 22:52:50 -0400
committerSimon Howard2015-04-11 22:52:50 -0400
commit282c7fdaaf7ff65709c99ba024e1972a98ed58d1 (patch)
tree77477a9238c9bcbb416e20a38761ed885d6d5269 /src/setup
parent5ddb558a635208d9c08210be8283c83a8d45278f (diff)
downloadchocolate-doom-282c7fdaaf7ff65709c99ba024e1972a98ed58d1.tar.gz
chocolate-doom-282c7fdaaf7ff65709c99ba024e1972a98ed58d1.tar.bz2
chocolate-doom-282c7fdaaf7ff65709c99ba024e1972a98ed58d1.zip
setup: Add OS X config for Gameport adapter.
The identified name/signature for this adapter is different under OS X. Also fix a mistake in the last commit.
Diffstat (limited to 'src/setup')
-rw-r--r--src/setup/joystick.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/setup/joystick.c b/src/setup/joystick.c
index db4ad258..6c26e950 100644
--- a/src/setup/joystick.c
+++ b/src/setup/joystick.c
@@ -387,7 +387,14 @@ static const known_joystick_t known_joysticks[] =
// which should just be the same configuration.
{
"WiseGroup.,Ltd Gameport to USB Controller",
- 3, 8, 1,
+ 4, 8, 1,
+ pc_gameport_controller,
+ },
+
+ // How the Super Joy Box 7 appears on Mac OS X.
+ {
+ "Gameport to USB Controller",
+ 2, 8, 1,
pc_gameport_controller,
},
};