diff options
Diffstat (limited to 'platform/x11')
| -rw-r--r-- | platform/x11/detect.py | 8 | ||||
| -rw-r--r-- | platform/x11/joystick_linux.cpp | 3 | ||||
| -rw-r--r-- | platform/x11/os_x11.cpp | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 5f272536ba..3c50e2cf5b 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -182,7 +182,9 @@ def configure(env): print("PulseAudio development libraries not found, disabling driver") env.Append(CPPFLAGS=['-DX11_ENABLED','-DUNIX_ENABLED','-DGLES2_ENABLED','-DGLES_OVER_GL']) - env.Append(LIBS=['GL', 'GLU', 'pthread', 'z', 'dl']) + env.Append(LIBS=['GL', 'GLU', 'pthread', 'z']) + if (platform.system() == "Linux"): + env.Append(LIBS='dl') #env.Append(CPPFLAGS=['-DMPC_FIXED_POINT']) #host compiler is default.. @@ -209,5 +211,7 @@ def configure(env): if (env["use_static_cpp"]=="yes"): env.Append(LINKFLAGS=['-static-libstdc++']) - env["x86_opt_gcc"]=True + list_of_x86 = ['x86_64', 'x86', 'i386', 'i586'] + if any(platform.machine() in s for s in list_of_x86): + env["x86_opt_gcc"]=True diff --git a/platform/x11/joystick_linux.cpp b/platform/x11/joystick_linux.cpp index 82f79c2640..4a6a4f3a52 100644 --- a/platform/x11/joystick_linux.cpp +++ b/platform/x11/joystick_linux.cpp @@ -45,7 +45,9 @@ #define test_bit(nr, addr) (((1UL << ((nr) % LONG_BITS)) & ((addr)[(nr) / LONG_BITS])) != 0) #define NBITS(x) ((((x)-1)/LONG_BITS)+1) +#ifdef UDEV_ENABLED static const char* ignore_str = "/dev/input/js"; +#endif joystick_linux::Joystick::Joystick() { fd = -1; @@ -198,7 +200,6 @@ void joystick_linux::monitor_joysticks(udev *p_udev) { } usleep(50000); } - //printf("exit udev\n"); udev_monitor_unref(mon); } #endif diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 12957b81b7..846c61fd1f 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -116,7 +116,9 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi x11_display = XOpenDisplay(NULL); char * modifiers = XSetLocaleModifiers ("@im=none"); - ERR_FAIL_COND( modifiers == NULL ); + if (modifiers==NULL) { + WARN_PRINT("Error setting locale modifiers"); + } const char* err; xrr_get_monitors = NULL; |