diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-10-13 01:19:32 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-10-13 01:19:32 -0300 |
| commit | b3cda43a0fb49e1cb9c8414077a23fa4b61ede38 (patch) | |
| tree | 1fee133b2fbc6f2bade96cc9914a449cbb9dbe1e /platform/javascript/os_javascript.h | |
| parent | 52e756752e1db9e4cf7c5bb7e92d44995ad674c4 (diff) | |
| parent | aad2bbdb6fb7c8217d7e75480b38e45f00cb3abd (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
platform/windows/detect.py
Diffstat (limited to 'platform/javascript/os_javascript.h')
| -rw-r--r-- | platform/javascript/os_javascript.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index 55ac7cdae4..1e925fb8df 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -40,6 +40,7 @@ #include "servers/visual/rasterizer.h" #include "audio_server_javascript.h" #include "audio_driver_javascript.h" +#include "main/input_default.h" typedef void (*GFXInitFunc)(void *ud,bool gl2,int w, int h, bool fs); typedef int (*OpenURIFunc)(const String&); |