mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-24 14:49:42 -06:00
compile fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1613 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -23,11 +23,11 @@ class GLWindow {
|
||||
int x, y;
|
||||
unsigned int depth;*/
|
||||
|
||||
virtual void SwapBuffers() = 0;
|
||||
virtual void SetWindowText(const char *text) = 0;
|
||||
virtual bool PeekMessages() = 0;
|
||||
virtual void Update() = 0;
|
||||
virtual bool MakeCurrent() = 0;
|
||||
virtual void SwapBuffers() {};
|
||||
virtual void SetWindowText(const char *text) {};
|
||||
virtual bool PeekMessages() {return false;};
|
||||
virtual void Update() {};;
|
||||
virtual bool MakeCurrent() {return false;};
|
||||
virtual void SetSize(u32 newWidth, u32 newHeight) {
|
||||
width = newWidth;
|
||||
height = newHeight;
|
||||
|
@ -32,6 +32,7 @@ public:
|
||||
#else
|
||||
class WXGLWindow : public GLWindow
|
||||
{
|
||||
public:
|
||||
WXGLWindow(int _iwidth, int _iheight) {}
|
||||
};
|
||||
#endif
|
||||
|
@ -18,7 +18,7 @@
|
||||
#include "Globals.h"
|
||||
#include "IniFile.h"
|
||||
#include "svnrev.h"
|
||||
|
||||
#include "Config.h"
|
||||
#include "Render.h"
|
||||
#include "nGLUtil.h"
|
||||
|
||||
@ -55,11 +55,11 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize,
|
||||
g_VideoInitialize.pPeekMessages = &Callback_PeekMessages;
|
||||
g_VideoInitialize.pUpdateFPSDisplay = &UpdateFPSDisplay;
|
||||
|
||||
if (strncmp(iBackend, "sdl") == 0)
|
||||
if (strncmp(g_Config.iBackend, "sdl") == 0)
|
||||
glWin = new SDLWindow(width, height);
|
||||
else if (strncmp(iBackend, "x11") == 0)
|
||||
else if (strncmp(g_Config.iBackend, "x11") == 0)
|
||||
glWin = new X11Window(width, height);
|
||||
else if (strncmp(iBackend, "wxgl") == 0)
|
||||
else if (strncmp(g_Config.iBackend, "wxgl") == 0)
|
||||
glWin = new WXGLWindow(width, height);
|
||||
|
||||
return (glWin?true:false);
|
||||
@ -95,6 +95,7 @@ u32 OpenGL_GetWidth() {
|
||||
|
||||
u32 OpenGL_GetHeight() {
|
||||
return glWin->GetWidth();
|
||||
}
|
||||
|
||||
void OpenGL_SetSize(u32 width, u32 height) {
|
||||
glWin->SetSize(width, height);
|
||||
|
Reference in New Issue
Block a user