Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-04 03:46:29 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

really fix opengl compile on MSVC (thanks to couriersud) (nw)

Browse Source
This commit is contained in:
Peter Ferrie 2015-03-02 19:00:45 -08:00
parent 7edfd8b21d
commit e77ccca75d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/osd/modules/opengl/osd_opengl.h
View File

@ -17,6 +17,7 @@
*/ */
#ifdef OSD_WINDOWS #ifdef OSD_WINDOWS
#ifdef _MSC_VER #ifdef _MSC_VER
#include <windows.h>
#include "SDL1211_opengl.h" #include "SDL1211_opengl.h"
#else #else
#include "GL/gl.h" #include "GL/gl.h"

16
src/osd/modules/render/drawogl.c
View File

@ -199,10 +199,10 @@ public:
{ {
m_error[0] = 0; m_error[0] = 0;
this->pfn_wglGetProcAddress = (PROC WINAPI (*)(LPCSTR lpszProc)) GetProcAddress(m_module, "wglGetProcAddress"); this->pfn_wglGetProcAddress = (PROC (WINAPI *)(LPCSTR lpszProc)) GetProcAddress(m_module, "wglGetProcAddress");
this->pfn_wglCreateContext = (HGLRC WINAPI (*)(HDC hdc)) GetProcAddress(m_module, "wglCreateContext"); this->pfn_wglCreateContext = (HGLRC (WINAPI *)(HDC hdc)) GetProcAddress(m_module, "wglCreateContext");
this->pfn_wglDeleteContext = (BOOL WINAPI (*)(HGLRC hglrc)) GetProcAddress(m_module, "wglDeleteContext"); this->pfn_wglDeleteContext = (BOOL (WINAPI *)(HGLRC hglrc)) GetProcAddress(m_module, "wglDeleteContext");
this->pfn_wglMakeCurrent = (BOOL WINAPI (*)(HDC hdc, HGLRC hglrc)) GetProcAddress(m_module, "wglMakeCurrent"); this->pfn_wglMakeCurrent = (BOOL (WINAPI *)(HDC hdc, HGLRC hglrc)) GetProcAddress(m_module, "wglMakeCurrent");
m_hdc = GetDC(window); m_hdc = GetDC(window);
if (!setupPixelFormat(m_hdc)) if (!setupPixelFormat(m_hdc))
@ -306,10 +306,10 @@ private:
HDC m_hdc; HDC m_hdc;
char m_error[256]; char m_error[256];
PROC WINAPI (*pfn_wglGetProcAddress)(LPCSTR lpszProc); PROC (WINAPI *pfn_wglGetProcAddress)(LPCSTR lpszProc);
HGLRC WINAPI (*pfn_wglCreateContext)(HDC hdc); HGLRC (WINAPI *pfn_wglCreateContext)(HDC hdc);
BOOL WINAPI (*pfn_wglDeleteContext)(HGLRC hglrc); BOOL (WINAPI *pfn_wglDeleteContext)(HGLRC hglrc);
BOOL WINAPI (*pfn_wglMakeCurrent)(HDC hdc, HGLRC hglrc); BOOL (WINAPI *pfn_wglMakeCurrent)(HDC hdc, HGLRC hglrc);
static HMODULE m_module; static HMODULE m_module;
}; };