diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-08 21:29:57 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-08 21:33:37 +0100 |
| commit | 5bfa4227b309062b3ec9651a5d0c1e560a3f9863 (patch) | |
| tree | 0d8ad4e601cda85175e230a8f595aae6ea3b88c0 /platform/x11 | |
| parent | c2310b41fa71ce94c2cc127c55b39b8ba07ab4c3 (diff) | |
Finish replacement of joystick by joypad
Some parts were forgotten in 547a577.
Diffstat (limited to 'platform/x11')
| -rw-r--r-- | platform/x11/SCsub | 2 | ||||
| -rw-r--r-- | platform/x11/joypad_linux.cpp (renamed from platform/x11/joystick_linux.cpp) | 4 | ||||
| -rw-r--r-- | platform/x11/joypad_linux.h (renamed from platform/x11/joystick_linux.h) | 3 | ||||
| -rw-r--r-- | platform/x11/os_x11.h | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/platform/x11/SCsub b/platform/x11/SCsub index 0defd4f025..4ae8ac07f7 100644 --- a/platform/x11/SCsub +++ b/platform/x11/SCsub @@ -7,7 +7,7 @@ common_x11 = [\ "context_gl_x11.cpp",\ "os_x11.cpp",\ "key_mapping_x11.cpp",\ - "joystick_linux.cpp",\ + "joypad_linux.cpp",\ ] env.Program('#bin/godot', ['godot_x11.cpp'] + common_x11) diff --git a/platform/x11/joystick_linux.cpp b/platform/x11/joypad_linux.cpp index bef2ef3fc6..f07d34b5e0 100644 --- a/platform/x11/joystick_linux.cpp +++ b/platform/x11/joypad_linux.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* joypad_linux.cpp */ +/* joypad_linux.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -30,7 +30,7 @@ //author: Andreas Haas <hondres, liugam3@gmail.com> #ifdef JOYDEV_ENABLED -#include "joystick_linux.h" +#include "joypad_linux.h" #include <linux/input.h> #include <unistd.h> diff --git a/platform/x11/joystick_linux.h b/platform/x11/joypad_linux.h index ebd1e82104..92687995fb 100644 --- a/platform/x11/joystick_linux.h +++ b/platform/x11/joypad_linux.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* joypad_linux.h */ +/* joypad_linux.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -30,6 +30,7 @@ //author: Andreas Haas <hondres, liugam3@gmail.com> #ifndef JOYPAD_LINUX_H #define JOYPAD_LINUX_H + #ifdef JOYDEV_ENABLED #include "main/input_default.h" #include "os/thread.h" diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index 4f9ff71298..66974da3c1 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -48,7 +48,7 @@ #include "servers/physics_2d/physics_2d_server_sw.h" #include "servers/physics_2d/physics_2d_server_wrap_mt.h" #include "main/input_default.h" -#include "joystick_linux.h" +#include "joypad_linux.h" #include <X11/keysym.h> #include <X11/Xlib.h> |