Merge pull request #941 from Xele02/qt_work

Qt build broke
This commit is contained in:
Xele02 2013-03-11 00:33:01 -07:00
commit 26cf707a8a
3 changed files with 3 additions and 3 deletions

View File

@ -150,7 +150,7 @@ void EmuThread::run()
setCurrentThreadName("EmuThread");
host->UpdateUI();
host->InitGL();
host->InitGL(0);
EmuThread_LockDraw(true);

View File

@ -33,7 +33,7 @@ QtHost::QtHost(MainWindow *mainWindow_)
QObject::connect(this,SIGNAL(BootDoneSignal()),mainWindow,SLOT(Boot()));
}
void QtHost::InitGL()
bool QtHost::InitGL(std::string *error_string)
{
}

View File

@ -34,7 +34,7 @@ public:
void AddSymbol(std::string name, u32 addr, u32 size, int type);
void InitGL();
bool InitGL(std::string *error_string);
void BeginFrame();
void EndFrame();
void ShutdownGL();