diff options
author | 2015-12-06 13:55:07 -0600 | |
---|---|---|
committer | 2015-12-06 13:56:05 -0600 | |
commit | 418d057e976332e66ea69c2a4305f7555c0a1022 (patch) | |
tree | ffe23e98409b882357bfc0bb7a8bd476c1744c1c /src | |
parent | d47f8d623f226838cbfd3531b11dca6be3f32ac4 (diff) |
fix SDL on Windows compile
Diffstat (limited to 'src')
-rw-r--r-- | src/osd/modules/render/draw13.cpp | 10 | ||||
-rw-r--r-- | src/osd/modules/render/drawogl.cpp | 10 | ||||
-rw-r--r-- | src/osd/modules/sound/sdl_sound.cpp | 8 | ||||
-rw-r--r-- | src/osd/sdl/osdsdl.h | 30 | ||||
-rw-r--r-- | src/osd/sdl/video.h | 2 | ||||
-rw-r--r-- | src/osd/sdl/window.h | 14 |
6 files changed, 37 insertions, 37 deletions
diff --git a/src/osd/modules/render/draw13.cpp b/src/osd/modules/render/draw13.cpp index 6b5528f9a5e..f1f75fe57bf 100644 --- a/src/osd/modules/render/draw13.cpp +++ b/src/osd/modules/render/draw13.cpp @@ -174,11 +174,11 @@ public: } } - /* virtual */ int create(); - /* virtual */ int draw(const int update); - /* virtual */ int xy_to_render_target(const int x, const int y, int *xt, int *yt); - /* virtual */ void destroy(); - /* virtual */ render_primitive_list *get_primitives() + /* virtual */ int create() override; + /* virtual */ int draw(const int update) override; + /* virtual */ int xy_to_render_target(const int x, const int y, int *xt, int *yt) override; + /* virtual */ void destroy() override; + /* virtual */ render_primitive_list *get_primitives() override { osd_dim nd = window().blit_surface_size(); if (nd != m_blit_dim) diff --git a/src/osd/modules/render/drawogl.cpp b/src/osd/modules/render/drawogl.cpp index ae4ccd792d5..caaa4d6ea74 100644 --- a/src/osd/modules/render/drawogl.cpp +++ b/src/osd/modules/render/drawogl.cpp @@ -362,29 +362,29 @@ public: { SDL_GL_DeleteContext(m_context); } - virtual void MakeCurrent() + virtual void MakeCurrent() override { SDL_GL_MakeCurrent(m_window, m_context); } - virtual int SetSwapInterval(const int swap) + virtual int SetSwapInterval(const int swap) override { return SDL_GL_SetSwapInterval(swap); } - virtual const char *LastErrorMsg() + virtual const char *LastErrorMsg() override { if (m_error[0] == 0) return NULL; else return m_error; } - virtual void *getProcAddress(const char *proc) + virtual void *getProcAddress(const char *proc) override { return SDL_GL_GetProcAddress(proc); } - virtual void SwapBuffer() + virtual void SwapBuffer() override { SDL_GL_SwapWindow(m_window); } diff --git a/src/osd/modules/sound/sdl_sound.cpp b/src/osd/modules/sound/sdl_sound.cpp index 4506057f675..c2f83b41954 100644 --- a/src/osd/modules/sound/sdl_sound.cpp +++ b/src/osd/modules/sound/sdl_sound.cpp @@ -57,13 +57,13 @@ public: } virtual ~sound_sdl() { } - virtual int init(const osd_options &options); - virtual void exit(); + virtual int init(const osd_options &options) override; + virtual void exit() override; // sound_module - virtual void update_audio_stream(bool is_throttled, const INT16 *buffer, int samples_this_frame); - virtual void set_mastervolume(int attenuation); + virtual void update_audio_stream(bool is_throttled, const INT16 *buffer, int samples_this_frame) override; + virtual void set_mastervolume(int attenuation) override; private: int lock_buffer(bool is_throttled, long offset, long size, void **buffer1, long *length1, void **buffer2, long *length2); diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h index 22a3aad60b9..bf8e4535cdf 100644 --- a/src/osd/sdl/osdsdl.h +++ b/src/osd/sdl/osdsdl.h @@ -147,32 +147,32 @@ public: virtual ~sdl_osd_interface(); // general overridables - virtual void init(running_machine &machine); - virtual void update(bool skip_redraw); + virtual void init(running_machine &machine) override; + virtual void update(bool skip_redraw) override; // input overridables - virtual void customize_input_type_list(simple_list<input_type_entry> &typelist); + virtual void customize_input_type_list(simple_list<input_type_entry> &typelist) override; - virtual void video_register(); + virtual void video_register() override; - virtual bool video_init(); - virtual bool window_init(); - virtual bool input_init(); - virtual void input_pause(); - virtual void input_resume(); - virtual bool output_init(); + virtual bool video_init() override; + virtual bool window_init() override; + virtual bool input_init() override; + virtual void input_pause() override; + virtual void input_resume() override; + virtual bool output_init() override; //virtual bool midi_init(); - virtual void video_exit(); - virtual void window_exit(); - virtual void input_exit(); - virtual void output_exit(); + virtual void video_exit() override; + virtual void window_exit() override; + virtual void input_exit() override; + virtual void output_exit() override; //virtual void midi_exit(); sdl_options &options() { return m_options; } private: - virtual void osd_exit(); + virtual void osd_exit() override; void extract_video_config(); diff --git a/src/osd/sdl/video.h b/src/osd/sdl/video.h index 11cd32de38e..699f98512d1 100644 --- a/src/osd/sdl/video.h +++ b/src/osd/sdl/video.h @@ -171,7 +171,7 @@ public: static BOOL CALLBACK monitor_enum_callback(HMONITOR handle, HDC dc, LPRECT rect, LPARAM data); #endif private: - void virtual refresh(); + void virtual refresh() override; UINT64 m_handle; // handle to the monitor }; diff --git a/src/osd/sdl/window.h b/src/osd/sdl/window.h index 372df7c956b..3de110fe536 100644 --- a/src/osd/sdl/window.h +++ b/src/osd/sdl/window.h @@ -79,7 +79,7 @@ public: void notify_changed(); - osd_dim get_size() + osd_dim get_size() override { #if (SDLMAME_SDL2) int w=0; int h=0; @@ -92,18 +92,18 @@ public: int xy_to_render_target(int x, int y, int *xt, int *yt); - running_machine &machine() const { return m_machine; } - osd_monitor_info *monitor() const { return m_monitor; } - int fullscreen() const { return m_fullscreen; } + running_machine &machine() const override { return m_machine; } + osd_monitor_info *monitor() const override { return m_monitor; } + int fullscreen() const override { return m_fullscreen; } - render_target *target() { return m_target; } + render_target *target() override { return m_target; } #if (SDLMAME_SDL2) - SDL_Window *sdl_window() { return m_sdl_window; } + SDL_Window *sdl_window() override { return m_sdl_window; } #else SDL_Surface *sdl_surface() { return m_sdlsurf; } #endif - osd_dim blit_surface_size(); + osd_dim blit_surface_size() override; int prescale() const { return m_prescale; } // Pointer to next window |