godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-fixed build system to use pkg-config for evdev

Browse Source
This commit is contained in:
Juan Linietsky 2015-12-21 10:37:26 -03:00
parent 3fe740dac6
commit 46dee92c8e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
platform/x11/detect.py
View File

@ -45,7 +45,11 @@ def can_build():
print("xinerama not found.. x11 disabled.") print("xinerama not found.. x11 disabled.")
return False 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 return True # X11 enabled
def get_opts(): def get_opts():
@ -129,6 +133,7 @@ def configure(env):
env.ParseConfig('pkg-config x11 --cflags --libs') env.ParseConfig('pkg-config x11 --cflags --libs')
env.ParseConfig('pkg-config xinerama --cflags --libs') env.ParseConfig('pkg-config xinerama --cflags --libs')
env.ParseConfig('pkg-config xcursor --cflags --libs') env.ParseConfig('pkg-config xcursor --cflags --libs')
env.ParseConfig('pkg-config libevdev --cflags --libs')
if (env["openssl"]=="yes"): if (env["openssl"]=="yes"):
env.ParseConfig('pkg-config openssl --cflags --libs') env.ParseConfig('pkg-config openssl --cflags --libs')
@ -150,7 +155,7 @@ def configure(env):
env.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED']) env.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED'])
if platform.system() == 'Linux': if platform.system() == 'Linux':
env.Append(CPPFLAGS=["-DALSA_ENABLED"]) env.Append(CPPFLAGS=["-DALSA_ENABLED"])
env.Append(LIBS=['asound', 'evdev', 'udev']) env.Append(LIBS=['asound', 'udev'])
if (env["pulseaudio"]=="yes"): if (env["pulseaudio"]=="yes"):
if not os.system("pkg-config --exists libpulse-simple"): if not os.system("pkg-config --exists libpulse-simple"):

2
platform/x11/joystick_linux.cpp
View File

@ -33,7 +33,7 @@
#include "joystick_linux.h" #include "joystick_linux.h"
#include "print_string.h" #include "print_string.h"
#include <libevdev-1.0/libevdev/libevdev.h> #include <libevdev/libevdev.h>
#include <libudev.h> #include <libudev.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>