mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

more buildfixes

Browse Source
This commit is contained in:
twinaphex 2015-11-11 18:29:06 +01:00
parent 3c5f4bd243
commit 8e08db3446
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx/common/win32_common.c
View File

@ -18,6 +18,8 @@
#if !defined(_XBOX) #if !defined(_XBOX)
#define IDI_ICON 1
#ifndef _WIN32_WINNT #ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0500 //_WIN32_WINNT_WIN2K #define _WIN32_WINNT 0x0500 //_WIN32_WINNT_WIN2K
#endif #endif
@ -30,13 +32,20 @@
#include "../drivers_wm/win32_shader_dlg.h" #include "../drivers_wm/win32_shader_dlg.h"
#endif #endif
#ifndef _XBOX #ifdef __cplusplus
extern "C"
#endif
bool dinput_handle_message(void *dinput, UINT message, WPARAM wParam, LPARAM lParam);
unsigned g_resize_width; unsigned g_resize_width;
unsigned g_resize_height; unsigned g_resize_height;
unsigned g_pos_x = CW_USEDEFAULT; unsigned g_pos_x = CW_USEDEFAULT;
unsigned g_pos_y = CW_USEDEFAULT; unsigned g_pos_y = CW_USEDEFAULT;
bool g_resized; bool g_resized;
bool g_quit; bool g_quit;
HWND g_hwnd;
extern void *dinput_wgl;
/* Power Request APIs */ /* Power Request APIs */
@ -218,7 +227,6 @@ bool win32_window_init(WNDCLASSEX *wndclass)
return false; return false;
return true; return true;
} }
#endif
static bool win32_browser( static bool win32_browser(
HWND owner, HWND owner,

1
gfx/common/win32_common.h
View File

@ -41,6 +41,7 @@ extern unsigned g_pos_x;
extern unsigned g_pos_y; extern unsigned g_pos_y;
extern bool g_resized; extern bool g_resized;
extern bool g_quit; extern bool g_quit;
extern HWND g_hwnd;
LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message, LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message,
WPARAM wparam, LPARAM lparam); WPARAM wparam, LPARAM lparam);

13
gfx/drivers_context/wgl_ctx.c
View File

@ -40,8 +40,6 @@
#include "../common/win32_common.h" #include "../common/win32_common.h"
#include "../drivers_wm/win32_shader_dlg.h" #include "../drivers_wm/win32_shader_dlg.h"
#define IDI_ICON 1
#ifndef WGL_CONTEXT_MAJOR_VERSION_ARB #ifndef WGL_CONTEXT_MAJOR_VERSION_ARB
#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091
#endif #endif
@ -67,7 +65,6 @@
#endif #endif
static bool g_use_hw_ctx; static bool g_use_hw_ctx;
static HWND g_hwnd;
static HGLRC g_hrc; static HGLRC g_hrc;
static HGLRC g_hw_hrc; static HGLRC g_hw_hrc;
static HDC g_hdc; static HDC g_hdc;
@ -75,7 +72,6 @@ static HDC g_hdc;
static unsigned g_major; static unsigned g_major;
static unsigned g_minor; static unsigned g_minor;
bool g_quit;
static bool g_inited; static bool g_inited;
static unsigned g_interval; static unsigned g_interval;
@ -229,12 +225,7 @@ void create_gl_context(HWND hwnd)
} }
} }
#ifdef __cplusplus void *dinput_wgl;
extern "C"
#endif
bool dinput_handle_message(void *dinput, UINT message, WPARAM wParam, LPARAM lParam);
static void *dinput_wgl;
static void gfx_ctx_wgl_swap_interval(void *data, unsigned interval) static void gfx_ctx_wgl_swap_interval(void *data, unsigned interval)
{ {
@ -335,7 +326,7 @@ static bool gfx_ctx_wgl_init(void *data)
g_restore_desktop = false; g_restore_desktop = false;
win32_monitor_init(); win32_monitor_init();
if (!win32_window_init(&wndclass, WndProc)) if (!win32_window_init(&wndclass))
return false; return false;
if (!wgl_shader_dlg_init()) if (!wgl_shader_dlg_init())