Merge pull request #3660 from Hinsbart/fix_bb10

fix blackberry compilation
This commit is contained in:
punto- 2016-02-10 23:00:12 -03:00
commit 4321b543b5
2 changed files with 5 additions and 1 deletions

View File

@ -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() {

View File

@ -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;