diff options
author | 2016-02-21 11:48:45 +0100 | |
---|---|---|
committer | 2016-02-21 11:48:45 +0100 | |
commit | cc24a339d8c0517259084b5c178d784626ba965c (patch) | |
tree | 9868e9687b5802ae0a3733712a3bbeb3bc75c953 /src/osd/sdl/video.h | |
parent | b5daabda5495dea5c50e17961ecfed2ea8619d76 (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Second attempt
Diffstat (limited to 'src/osd/sdl/video.h')
-rw-r--r-- | src/osd/sdl/video.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/osd/sdl/video.h b/src/osd/sdl/video.h index 699f98512d1..a811a417ef4 100644 --- a/src/osd/sdl/video.h +++ b/src/osd/sdl/video.h @@ -11,11 +11,6 @@ #ifndef __SDLVIDEO__ #define __SDLVIDEO__ -#if defined(SDLMAME_WIN32) && !(SDLMAME_SDL2) -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#endif - #include "osdsdl.h" //============================================================ @@ -164,12 +159,6 @@ public: // STATIC static void init(); static void exit(); -#if !defined(SDLMAME_WIN32) && !(SDLMAME_SDL2) - static void add_primary_monitor(void *data); -#endif -#if defined(SDLMAME_WIN32) && !(SDLMAME_SDL2) - static BOOL CALLBACK monitor_enum_callback(HMONITOR handle, HDC dc, LPRECT rect, LPARAM data); -#endif private: void virtual refresh() override; @@ -192,9 +181,6 @@ struct osd_video_config int fullstretch; // FXIME: implement in windows! - // ddraw options - int hwstretch; // stretch using the hardware - // d3d, accel, opengl int filter; // enable filtering //int filter; // enable filtering, disabled if glsl_filter>0 |