diff options
| author | Ariel Manzur <ariel@godotengine.org> | 2015-12-21 09:17:15 -0300 |
|---|---|---|
| committer | Ariel Manzur <ariel@godotengine.org> | 2015-12-21 09:17:15 -0300 |
| commit | 0576e1e28f41f103cd06452d810a04265e3574cc (patch) | |
| tree | 817c1a5e3ca8b8f786e013c0322e4052e7f85d59 /platform/x11/SCsub | |
| parent | 72a6b137ba256f5198843f8980107c350d52e5ca (diff) | |
| parent | 15429d6ac95acb044c9eebd64356f33e7e5d14ef (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) |