[mupen64plus-input-sdl] 107/196: Imported Upstream version 1.99.5+8+26e230321985
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:00:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch master
in repository mupen64plus-input-sdl.
commit f3412928b9cf58268e7d6c78903c8e2c073b359b
Author: Sven Eckelmann <sven at narfation.org>
Date: Sat Jun 16 22:00:40 2012 +0200
Imported Upstream version 1.99.5+8+26e230321985
---
README | 5 ++-
data/InputAutoCfg.ini | 89 ++++++++++++++++++++++++++++++++++++++++++++++----
projects/unix/Makefile | 8 ++++-
src/config.c | 4 +--
4 files changed, 95 insertions(+), 11 deletions(-)
diff --git a/README b/README
index 097e7b7..61a508c 100644
--- a/README
+++ b/README
@@ -83,7 +83,10 @@ guide=KEY_ESC
x2^deadzone:27000
y2^deadzone:27000
-8. Default Keyboard interface:
+8. Saitek Cyborg V.3 Rumble Pad (aka Saitek PS2700)
+Honestly, it's one of the best pads that I've used in a long time, so thought I'd contribute this quick config. Basically, Dpad and Analog sticks are unchanged, C-buttons are mapped to the right analog stick, L-R triggers are L1 and R1, Z is mapped to R2, A + B are mapped to X and Square, respectively, start is mapped to the Home button, and Triangle, Square, L2, Start, Select, and the Analog triggers are unused, since it's not intuitive to use them for what's left.
+
+9. Default Keyboard interface:
Analog Pad is "Arrow Keys"
C Up/Left/Down/Right are "I", "J", "K", "L"
DPad Up/Left/Down/Right are "W", "A", "S", "D"
diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
index 8ab3ce7..d70e730 100644
--- a/data/InputAutoCfg.ini
+++ b/data/InputAutoCfg.ini
@@ -49,6 +49,31 @@ Rumblepak switch = key(114)
X Axis = axis(0-,0+)
Y Axis = axis(1-,1+)
+[Cyborg V.3 Rumble Pad]
+plugged = True
+plugin = 2
+mouse = False
+AnalogDeadzone = 4096,4096
+AnalogPeak = 32768,32768
+DPad R = axis(4+)
+DPad L = axis(4-)
+DPad D = axis(5+)
+DPad U = axis(5-)
+Start = button(12)
+Z Trig = button(7)
+B Button = button(0)
+A Button = button(1)
+C Button R = button(8) axis(2+)
+C Button L = button(3) axis(2-)
+C Button D = button(2) axis(3+)
+C Button U = button(9) axis(3-)
+R Trig = button(5)
+L Trig = button(4)
+Mempak switch =
+Rumblepak switch =
+X Axis = axis(0-,0+)
+Y Axis = axis(1-,1+)
+
[DragonRise Inc. Generic USB Joystick]
plugged = True
plugin = 2
@@ -278,6 +303,31 @@ Rumblepak switch = button(7)
X Axis = axis(0-,0+)
Y Axis = axis(1-,1+)
+[Logitech WingMan Action Pad]
+plugged = True
+plugin = 2
+mouse = False
+AnalogDeadzone = 4096,4096
+AnalogPeak = 32768,32768
+DPad R = button(13)
+DPad L = button(15)
+DPad D = button(14)
+DPad U = button(12)
+Start = button(8)
+Z Trig = button(6)
+B Button = button(3)
+A Button = button(0)
+C Button R = button(2)
+C Button L = button(4)
+C Button D = button(1)
+C Button U = button(5)
+R Trig = button(7)
+L Trig =
+Mempak switch =
+Rumblepak switch =
+X Axis = axis(0-,0+)
+Y Axis = axis(1-,1+)
+
[Mega World USB Game Controllers]
plugged = True
plugin = 2
@@ -359,6 +409,31 @@ Rumblepak switch = key(114)
X Axis = axis(0-,0+)
Y Axis = axis(1-,1+)
+[PC Game Controller]
+plugged = True
+plugin = 2
+mouse = False
+AnalogDeadzone = 4096,4096
+AnalogPeak = 32768,32768
+DPad R = hat(0 Right)
+DPad L = hat(0 Left)
+DPad D = hat(0 Down)
+DPad U = hat(0 Up)
+Start = button(9)
+Z Trig = button(8)
+B Button = button(4)
+A Button = button(5)
+C Button R = button(1)
+C Button L = button(3)
+C Button D = button(2)
+C Button U = button(0)
+R Trig = button(7)
+L Trig = button(6)
+Mempak switch = key(109)
+Rumblepak switch = key(114)
+X Axis = axis(0-,0+)
+Y Axis = axis(1-,1+)
+
[SAITEK P880]
plugged = True
plugin = 2
@@ -705,8 +780,8 @@ Start = button(9)
Z Trig = button(8)
B Button = button(2)
A Button = button(1)
-C Button R = axis(5-)
-C Button L = axis(5+)
+C Button R = axis(3-)
+C Button L = axis(3+)
C Button D = axis(2+)
C Button U = axis(2-)
R Trig = button(7)
@@ -729,16 +804,16 @@ Start = button(25)
Z Trig = button(24)
B Button = button(18)
A Button = button(17)
-C Button R = axis(6-)
-C Button L = axis(6+)
-C Button D = axis(3+)
-C Button U = axis(3-)
+C Button R = axis(7-)
+C Button L = axis(7+)
+C Button D = axis(6+)
+C Button U = axis(6-)
R Trig = button(23)
L Trig = button(22)
Mempak switch = key(44)
Rumblepak switch = key(46)
X Axis = axis(4-,4+)
-Y Axis = axis(7-,7+)
+Y Axis = axis(5-,5+)
; Asikgame - Super Dual Box (with two PS2 gamepads connected)
; this is a 2-port USB device. The Right port is controller #1, the Left port is #2
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index 590d186..e75ed93 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -142,7 +142,7 @@ ifeq ($(OS), OSX)
else
CFLAGS += -mmmx -msse -fomit-frame-pointer -arch i686 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
LDFLAGS += -arch i686
- LDLIBS += -ldl
+ LDLIBS += -ldl -read_only_relocs suppress
endif
endif
endif
@@ -269,6 +269,7 @@ targets:
@echo " Debugging Options:"
@echo " DEBUG=1 == add debugging symbols"
@echo " PLUGINDBG=1 == print extra debugging information while running"
+ @echo " LTO=1 == enable experimental build with link-time optimization"
@echo " V=1 == show verbose compiler output"
all: $(TARGET)
@@ -288,6 +289,11 @@ clean:
rebuild: clean all
+ifeq ($(LTO), 1)
+ CFLAGS += -flto
+ LDFLAGS += -fuse-linker-plugin $(CFLAGS)
+endif
+
# standard build rules
$(OBJDIR)/%.o: $(SRCDIR)/%.c
$(COMPILE.c) -o $@ $<
diff --git a/src/config.c b/src/config.c
index 885c30c..5545872 100644
--- a/src/config.c
+++ b/src/config.c
@@ -326,7 +326,7 @@ static void save_controller_config(int iCtrlIdx, const char *pccDeviceName)
}
/* save the general controller parameters */
- ConfigSetDefaultFloat(pConfig, "version", CONFIG_VERSION, "Mupen64Plus SDL Input Plugin config parameter version number. Please don't change");
+ ConfigSetDefaultFloat(pConfig, "version", CONFIG_VERSION, "Mupen64Plus SDL Input Plugin config parameter version number. Please don't change this version number.");
ConfigSetDefaultBool(pConfig, "plugged", controller[iCtrlIdx].control->Present, "Specifies whether this controller is 'plugged in' to the simulated N64");
ConfigSetDefaultInt(pConfig, "plugin", controller[iCtrlIdx].control->Plugin, "Specifies which type of expansion pak is in the controller: 1=None, 2=Mem pak, 5=Rumble pak");
ConfigSetDefaultBool(pConfig, "mouse", controller[iCtrlIdx].mouse, "If True, then mouse buttons may be used with this controller");
@@ -505,7 +505,7 @@ void load_configuration(int bPrintSummary)
{
controller[n64CtrlIdx].device = DEVICE_AUTO;
controller[n64CtrlIdx].control->Present = 0;
- DebugMessage(M64MSG_WARNING, "N64 Controller #%i: Disabled, SDL joystick %i is not available", n64CtrlIdx+1, sdlCtrlIdx-1);
+ DebugMessage(M64MSG_VERBOSE, "N64 Controller #%i: Disabled, SDL joystick %i is not available", n64CtrlIdx+1, sdlCtrlIdx-1);
}
else
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-input-sdl.git
More information about the Pkg-games-commits
mailing list