summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2014-09-07 02:00:37 +0200
committerFlorian Jung <flo@windfisch.org>2014-09-07 02:01:15 +0200
commit307b290590a170d0b8c88618598486e705492222 (patch)
treebaa40dfe34183c43d8855d248a59adc5f9bad411
parent8e93ae7d2035e08c61df10261ca989d35194d09d (diff)
updated patch to apply cleanly against mupen64plus-inpt-sdl-2.0
(probably still works against 1.5)
-rw-r--r--README6
-rw-r--r--mupen64plus-input-sdl.patch16
2 files changed, 13 insertions, 9 deletions
diff --git a/README b/README
index 206885b..9c6b341 100644
--- a/README
+++ b/README
@@ -37,7 +37,11 @@ Then press "ENTER" in the mariokart bot command window and enjoy :)
------====== How to use ======------
-edit os.h and set your OS (if you use FreeBSD, you must patch mupen64plus!)
+edit os.h and set your OS
+if you don't use the uinput method (hint: you don't), you
+ must apply mupen64plus-input-sdl.patch to the emulator.
+ in gentoo, it is sufficient to copy the patch to
+ /etc/portage/patches/games-emulation/mupen64plus-input-sdl/
edit mariokart.cpp and fix the startup of mupen,
in mariokart.cpp, fix the window title the XorgGrabber uses
if you use bsdmake, run ./convert_to_bsd_makefile.sh first.
diff --git a/mupen64plus-input-sdl.patch b/mupen64plus-input-sdl.patch
index 20e1f91..af6d2d4 100644
--- a/mupen64plus-input-sdl.patch
+++ b/mupen64plus-input-sdl.patch
@@ -1,6 +1,6 @@
-diff -ru mupen64plus-bundle-src-1.99.4-orig/source/mupen64plus-input-sdl/src/plugin.c mupen64plus-bundle-src-1.99.4/source/mupen64plus-input-sdl/src/plugin.c
---- mupen64plus-bundle-src-1.99.4-orig/source/mupen64plus-input-sdl/src/plugin.c 2012-11-20 20:38:20.000000000 +0100
-+++ mupen64plus-bundle-src-1.99.4/source/mupen64plus-input-sdl/src/plugin.c 2012-11-26 18:17:51.000000000 +0100
+diff -u --recursive a/mupen64plus-input-sdl-src-2.0/src/plugin.c b/mupen64plus-input-sdl-src-2.0/src/plugin.c
+--- a/mupen64plus-input-sdl-src-2.0/src/plugin.c 2014-09-07 01:36:37.462792158 +0200
++++ b/mupen64plus-input-sdl-src-2.0/src/plugin.c 2014-09-07 01:36:37.460792158 +0200
@@ -24,6 +24,12 @@
#include <stdio.h>
#include <stdlib.h>
@@ -14,7 +14,7 @@ diff -ru mupen64plus-bundle-src-1.99.4-orig/source/mupen64plus-input-sdl/src/plu
#include <SDL.h>
-@@ -133,6 +139,151 @@
+@@ -136,6 +142,151 @@
static CONTROL temp_core_controlinfo[4];
@@ -166,7 +166,7 @@ diff -ru mupen64plus-bundle-src-1.99.4-orig/source/mupen64plus-input-sdl/src/plu
/* Mupen64Plus plugin functions */
EXPORT m64p_error CALL PluginStartup(m64p_dynlib_handle CoreLibHandle, void *Context,
void (*DebugCallback)(void *, int, const char *))
-@@ -454,6 +605,12 @@
+@@ -464,6 +615,12 @@
SDL_Event event;
unsigned char mstate;
@@ -177,11 +177,11 @@ diff -ru mupen64plus-bundle-src-1.99.4-orig/source/mupen64plus-input-sdl/src/plu
+ }
+
// Handle keyboard input first
- doSdlKeys(SDL_GetKeyState(NULL));
+ doSdlKeys(SDL_GetKeyboardState(NULL));
doSdlKeys(myKeyState);
-@@ -596,7 +753,21 @@
+@@ -614,7 +771,21 @@
#ifdef _DEBUG
- DebugMessage(M64MSG_VERBOSE, "Controller #%d value: 0x%8.8X\n", Control, *(int *)&controller[Control].buttons );
+ DebugMessage(M64MSG_VERBOSE, "Controller #%d value: 0x%8.8X", Control, *(int *)&controller[Control].buttons );
#endif
- *Keys = controller[Control].buttons;
+