Mercurial > mplayer.hg
changeset 21631:2d3fdf94a50c
Fix compilation under MinGW with X11 enabled
| author | reimar |
|---|---|
| date | Sun, 17 Dec 2006 12:33:09 +0000 |
| parents | 0d8005d2fe5c |
| children | e3e6d6fbb561 |
| files | libvo/gl_common.c libvo/vo_gl.c libvo/vo_gl2.c libvo/w32_common.c libvo/w32_common.h |
| diffstat | 5 files changed, 14 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/gl_common.c Sun Dec 17 12:00:55 2006 +0000 +++ b/libvo/gl_common.c Sun Dec 17 12:33:09 2006 +0000 @@ -1338,7 +1338,7 @@ } // set new values - vo_window = win; + vo_w32_window = win; vo_hdc = windc; { RECT rect;
--- a/libvo/vo_gl.c Sun Dec 17 12:00:55 2006 +0000 +++ b/libvo/vo_gl.c Sun Dec 17 12:33:09 2006 +0000 @@ -32,6 +32,9 @@ #ifdef GL_WIN32 static int gl_vinfo = 0; static HGLRC gl_context = 0; +#define update_xinerama_info w32_update_xinerama_info +#define vo_init vo_w32_init +#define vo_window vo_w32_window #else static XVisualInfo *gl_vinfo = NULL; static GLXContext gl_context = 0;
--- a/libvo/vo_gl2.c Sun Dec 17 12:00:55 2006 +0000 +++ b/libvo/vo_gl2.c Sun Dec 17 12:33:09 2006 +0000 @@ -52,6 +52,9 @@ #ifdef GL_WIN32 static int gl_vinfo = 0; static HGLRC gl_context = 0; +#define update_xinerama_info w32_update_xinerama_info +#define vo_init vo_w32_init +#define vo_window vo_w32_window #else static XVisualInfo *gl_vinfo = NULL; static GLXContext gl_context = 0;
--- a/libvo/w32_common.c Sun Dec 17 12:00:55 2006 +0000 +++ b/libvo/w32_common.c Sun Dec 17 12:33:09 2006 +0000 @@ -29,6 +29,7 @@ uint32_t o_dheight; static HINSTANCE hInstance; +#define vo_window vo_w32_window HWND vo_window = 0; static int event_flags; static int mon_cnt; @@ -147,7 +148,7 @@ return TRUE; } -void update_xinerama_info(void) { +void w32_update_xinerama_info(void) { xinerama_x = xinerama_y = 0; if (xinerama_screen < -1) { int tmp; @@ -186,7 +187,7 @@ vo_screenwidth = dm.dmPelsWidth; vo_screenheight = dm.dmPelsHeight; vo_depthonscreen = dm.dmBitsPerPel; - update_xinerama_info(); + w32_update_xinerama_info(); } static void changeMode(void) { @@ -310,7 +311,7 @@ return createRenderingContext(); } -int vo_init(void) { +int vo_w32_init(void) { HICON mplayerIcon = 0; char exedir[MAX_PATH]; HINSTANCE user32;
--- a/libvo/w32_common.h Sun Dec 17 12:00:55 2006 +0000 +++ b/libvo/w32_common.h Sun Dec 17 12:33:09 2006 +0000 @@ -3,17 +3,17 @@ extern int vo_screenheight; extern uint32_t o_dwidth; extern uint32_t o_dheight; -extern HWND vo_window; +extern HWND vo_w32_window; extern HDC vo_hdc; extern int vo_fs; extern int vo_vm; extern int vo_ontop; -extern int vo_init(void); +extern int vo_w32_init(void); extern void vo_w32_uninit(void); extern void vo_w32_ontop(void); extern void vo_w32_fullscreen(void); extern int vo_w32_check_events(void); extern int vo_w32_config(uint32_t, uint32_t, uint32_t); extern void destroyRenderingContext(void); -extern void update_xinerama_info(void); +extern void w32_update_xinerama_info(void);