Merge pull request #3066 from degasus/master

GLInterface: Fix VideoSW on linux + OSX (v2)

Conflicts:
	Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp
This commit is contained in:
flacs
2015-09-20 03:30:46 +02:00
committed by Jules Blok
parent 2814aa20c8
commit bfd5c6c69d
10 changed files with 20 additions and 15 deletions

View File

@ -57,7 +57,7 @@ bool cInterfaceWGL::PeekMessages()
// Create rendering window.
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
bool cInterfaceWGL::Create(void *window_handle)
bool cInterfaceWGL::Create(void *window_handle, bool core)
{
if (window_handle == nullptr)
return false;