[mupen64plus-input-sdl] 84/196: Imported Upstream version 1.99.4+35+db912fcfb862

[Sven Eckelmann]

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 1d0236616d0e3f527b1fdeaf22548adfb00ebf9a
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Nov 12 20:19:14 2011 +0100

    Imported Upstream version 1.99.4+35+db912fcfb862
---
 data/InputAutoCfg.ini  | 33 +++++++++++++++++++++++++++++----
 projects/unix/Makefile |  3 +++
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/data/InputAutoCfg.ini b/data/InputAutoCfg.ini
index fbca015..2d854b0 100644
--- a/data/InputAutoCfg.ini
+++ b/data/InputAutoCfg.ini
@@ -505,10 +505,10 @@ 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-)
+DPad R = hat(0 Right)
+DPad L = hat(0 Left)
+DPad D = hat(0 Down)
+DPad U = hat(0 Up)
 Start = button(5)
 Z Trig = button(4)
 B Button = button(0)
@@ -524,6 +524,31 @@ Rumblepak switch = axis(10+)
 X Axis = axis(0-,0+)
 Y Axis = axis(1-,1+)
 
+[Saitek P2900 Wireless 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(6)
+Z Trig = button(7)
+B Button = button(0)
+A Button = button(1)
+C Button R = button(8) axis(3+)
+C Button L = button(3) axis(3-)
+C Button D = button(2) axis(2+)
+C Button U = button(9) axis(2-)
+R Trig = button(5)
+L Trig = button(4)
+Mempak switch = button(11)
+Rumblepak switch = axis(10+)
+X Axis = axis(0-,0+)
+Y Axis = axis(1-,1+)
+
 [Thrustmaster Dual Trigger 3-in-1]
 plugged = True
 plugin = 2
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index 64f4005..590d186 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -110,6 +110,9 @@ LDFLAGS += $(SHARED)
 ifeq ($(PIC), 1)
   CFLAGS += -fPIC
   LDFLAGS += -fPIC
+else
+  CFLAGS += -fno-PIC
+  LDFLAGS += -fno-PIC
 endif
 
 ifeq ($(BIG_ENDIAN), 1)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-input-sdl.git