ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gsdx-ogl-wnd: multiple VS compilation fix. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/gsdx-ogl-wnd@5500 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2013-01-04 15:41:37 +00:00
parent 4d90ad17a1
commit 4fb7474e9c
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/GSdx/GS.cpp
View File

@ -275,8 +275,9 @@ static int _GSopen(void** dsp, char* title, int renderer, int threads = -1)
default:
#ifdef _WINDOWS
s_gs->m_wnd = new GSWndDX(); break;
#endif
#else
case 4: s_gs->m_wnd = new GSWndOGL(); break;
#endif
}
}
}

9
plugins/GSdx/GSWndDX.cpp
View File

@ -19,6 +19,7 @@
*
*/
#include "stdafx.h"
#include "GSWndDX.h"
#ifdef _WINDOWS
@ -34,11 +35,11 @@ GSWndDX::~GSWndDX()
LRESULT CALLBACK GSWndDX::WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
GSWnd* wnd = NULL;
GSWndDX* wnd = NULL;
if(message == WM_NCCREATE)
{
wnd = (GSWnd*)((LPCREATESTRUCT)lParam)->lpCreateParams;
wnd = (GSWndDX*)((LPCREATESTRUCT)lParam)->lpCreateParams;
SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)wnd);
@ -46,7 +47,7 @@ LRESULT CALLBACK GSWndDX::WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
}
else
{
wnd = (GSWnd*)GetWindowLongPtr(hWnd, GWLP_USERDATA);
wnd = (GSWndDX*)GetWindowLongPtr(hWnd, GWLP_USERDATA);
}
if(wnd == NULL)
@ -92,7 +93,7 @@ bool GSWndDX::Create(const string& title, int w, int h)
// TODO: wc.hIcon = ;
wc.hCursor = LoadCursor(NULL, IDC_ARROW);
wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);
wc.lpszClassName = "GSWnd";
wc.lpszClassName = "GSWndDX";
if(!GetClassInfo(wc.hInstance, wc.lpszClassName, &wc))
{

1
plugins/GSdx/GSWndDX.h
View File

@ -19,6 +19,7 @@
*
*/
#include "stdafx.h"
#include "GSWnd.h"
#ifdef _WINDOWS

3
plugins/GSdx/GSWndOGL.h
View File

@ -20,9 +20,10 @@
*/
#include "GSWnd.h"
#include <X11/Xlib.h>
#ifdef _LINUX
#include <X11/Xlib.h>
class GSWndOGL : public GSWnd
{
void* m_window;