diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-12-21 09:07:06 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-12-21 09:07:06 -0300 |
| commit | 15429d6ac95acb044c9eebd64356f33e7e5d14ef (patch) | |
| tree | 872a375b64d93fd6aaf1239e058a13630c9cfabe /platform/x11/SCsub | |
| parent | 81f62fb78c7f3c133ef764a99dcdf05077d8ced9 (diff) | |
| parent | b2f670ebaefa16b0345f9a7ae825f78dbfdec9f8 (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'platform/x11/SCsub')
| -rw-r--r-- | platform/x11/SCsub | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/platform/x11/SCsub b/platform/x11/SCsub index 7a6f02daa5..80fd347ded 100644 --- a/platform/x11/SCsub +++ b/platform/x11/SCsub @@ -5,6 +5,7 @@ common_x11=[\ "context_gl_x11.cpp",\ "os_x11.cpp",\ "key_mapping_x11.cpp",\ + "joystick_linux.cpp",\ ] env.Program('#bin/godot',['godot_x11.cpp']+common_x11) |