diff options
| -rw-r--r-- | platform/x11/detect.py | 9 | ||||
| -rw-r--r-- | platform/x11/joystick_linux.cpp | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index a4b8f835e8..c93905ed3c 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -45,7 +45,11 @@ def can_build(): print("xinerama not found.. x11 disabled.") return False - + x11_error=os.system("pkg-config libevdev --modversion > /dev/null ") + if (x11_error): + print("evdev not found.. x11 disabled.") + return False + return True # X11 enabled def get_opts(): @@ -129,6 +133,7 @@ def configure(env): env.ParseConfig('pkg-config x11 --cflags --libs') env.ParseConfig('pkg-config xinerama --cflags --libs') env.ParseConfig('pkg-config xcursor --cflags --libs') + env.ParseConfig('pkg-config libevdev --cflags --libs') if (env["openssl"]=="yes"): env.ParseConfig('pkg-config openssl --cflags --libs') @@ -150,7 +155,7 @@ def configure(env): env.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED']) if platform.system() == 'Linux': env.Append(CPPFLAGS=["-DALSA_ENABLED"]) - env.Append(LIBS=['asound', 'evdev', 'udev']) + env.Append(LIBS=['asound', 'udev']) if (env["pulseaudio"]=="yes"): if not os.system("pkg-config --exists libpulse-simple"): diff --git a/platform/x11/joystick_linux.cpp b/platform/x11/joystick_linux.cpp index cfc4f7cd2b..e50916d2c2 100644 --- a/platform/x11/joystick_linux.cpp +++ b/platform/x11/joystick_linux.cpp @@ -33,7 +33,7 @@ #include "joystick_linux.h" #include "print_string.h" -#include <libevdev-1.0/libevdev/libevdev.h> +#include <libevdev/libevdev.h> #include <libudev.h> #include <unistd.h> #include <fcntl.h> |