diff options
author | punto- <ariel@godotengine.org> | 2016-02-10 23:00:12 -0300 |
---|---|---|
committer | punto- <ariel@godotengine.org> | 2016-02-10 23:00:12 -0300 |
commit | 4321b543b5b971e6fc980f51f24c6877fd6ae07e (patch) | |
tree | 1c8ceb80453ce315fcb1a4a6604f91391d2703ee | |
parent | d0748b0f4688cb50d2bde15e96091c82986aa499 (diff) | |
parent | 274f57feea5374500f513802f92efc08a165c8d3 (diff) |
Merge pull request #3660 from Hinsbart/fix_bb10
fix blackberry compilation
-rw-r--r-- | platform/bb10/os_bb10.cpp | 4 | ||||
-rw-r--r-- | platform/bb10/os_bb10.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/platform/bb10/os_bb10.cpp b/platform/bb10/os_bb10.cpp index d2a350cf83..58ea26b8c9 100644 --- a/platform/bb10/os_bb10.cpp +++ b/platform/bb10/os_bb10.cpp @@ -29,7 +29,6 @@ #include "os_bb10.h" #include "drivers/gles2/rasterizer_gles2.h" -#include "drivers/gles1/rasterizer_gles1.h" #include "servers/visual/visual_server_raster.h" #include "core/os/dir_access.h" @@ -605,6 +604,9 @@ String OSBB10::get_data_dir() const { return data_dir; }; +Size2 OSBB10::get_window_size() const { + return Vector2(default_videomode.width, default_videomode.height); +} OSBB10::OSBB10() { diff --git a/platform/bb10/os_bb10.h b/platform/bb10/os_bb10.h index a0481d1190..4ee5af8323 100644 --- a/platform/bb10/os_bb10.h +++ b/platform/bb10/os_bb10.h @@ -32,6 +32,7 @@ #include "os/input.h" #include "drivers/unix/os_unix.h" #include "os/main_loop.h" +#include "main/input_default.h" #include "servers/physics/physics_server_sw.h" #include "servers/spatial_sound/spatial_sound_server_sw.h" #include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h" @@ -135,6 +136,7 @@ public: virtual VideoMode get_video_mode(int p_screen=0) const; virtual void get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen=0) const; + virtual Size2 get_window_size() const; virtual String get_name(); virtual MainLoop *get_main_loop() const; |