mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
This commit is contained in:
commit
ed9244edee
@ -106,7 +106,9 @@ HOST_PKG_CONFIG_PATH=""
|
|||||||
HOST_PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pkgconfig"
|
HOST_PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pkgconfig"
|
||||||
HOST_PKG_CONFIG_SYSROOT_DIR=""
|
HOST_PKG_CONFIG_SYSROOT_DIR=""
|
||||||
|
|
||||||
export CCACHE_DIR=$HOME/.ccache-openelec
|
if [ -z "$CCACHE_DIR" ]; then
|
||||||
|
export CCACHE_DIR=$HOME/.ccache-openelec
|
||||||
|
fi
|
||||||
export MAKEFLAGS=-j$CONCURRENCY_MAKE_LEVEL
|
export MAKEFLAGS=-j$CONCURRENCY_MAKE_LEVEL
|
||||||
export PKG_CONFIG=$ROOT/$TOOLCHAIN/bin/pkg-config
|
export PKG_CONFIG=$ROOT/$TOOLCHAIN/bin/pkg-config
|
||||||
|
|
||||||
|
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
|
||||||
|
index ee43974..80e46e4 100644
|
||||||
|
--- a/src/joystick/linux/SDL_sysjoystick.c
|
||||||
|
+++ b/src/joystick/linux/SDL_sysjoystick.c
|
||||||
|
@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd)
|
||||||
|
++joystick->nbuttons;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
- for ( i=0; i<ABS_MISC; ++i ) {
|
||||||
|
+ for ( i=0; i<ABS_MAX; ++i ) {
|
||||||
|
/* Skip hats */
|
||||||
|
if ( i == ABS_HAT0X ) {
|
||||||
|
i = ABS_HAT3Y;
|
Loading…
x
Reference in New Issue
Block a user