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

compile fix 

(event handler works on linux with gltest and padsimpleenv)


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1877 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-01-15 11:46:09 +00:00
parent 9dcb4edc97
commit 5d230ee9ab
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/Src/Timer.h
View File

@ -19,6 +19,7 @@
#define _TIMER_H #define _TIMER_H
#include "Common.h" #include "Common.h"
#include <string>
namespace Common namespace Common
{ {

4
Source/Plugins/Plugin_VideoOGL/Src/GLWindow.h
View File

@ -8,7 +8,11 @@
#include "Config.h" #include "Config.h"
#include "pluginspecs_video.h" #include "pluginspecs_video.h"
#ifdef _WIN32
#include <GLew/glew.h> #include <GLew/glew.h>
#else
#include <GL/glew.h>
#endif
#if defined(__APPLE__) #if defined(__APPLE__)
#include <OpenGL/gl.h> #include <OpenGL/gl.h>

12
Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp
View File

@ -109,12 +109,12 @@ void DllConfig(HWND _hParent)
frame.ShowModal(); frame.ShowModal();
} }
void Video_Initialize(SVideoInitialize* _pVideoInitialize) void Initialize(void *init)
{ {
if (_pVideoInitialize == NULL)
return;
frameCount = 0; frameCount = 0;
g_VideoInitialize = *_pVideoInitialize; SVideoInitialize *_pVideoInitialize = (SVideoInitialize*)init;
g_VideoInitialize = *(_pVideoInitialize); // Create a shortcut to _pVideoInitialize that can also update it
InitLUTs(); InitLUTs();
InitXFBConvTables(); InitXFBConvTables();
g_Config.Load(); g_Config.Load();
@ -130,7 +130,7 @@ void Video_Initialize(SVideoInitialize* _pVideoInitialize)
Renderer::AddMessage("Dolphin OpenGL Video Plugin" ,5000); Renderer::AddMessage("Dolphin OpenGL Video Plugin" ,5000);
} }
void Video_DoState(unsigned char **ptr, int mode) { void DoState(unsigned char **ptr, int mode) {
#ifndef _WIN32 #ifndef _WIN32
OpenGL_MakeCurrent(); OpenGL_MakeCurrent();
#endif #endif
@ -173,7 +173,7 @@ void Video_Prepare(void)
TextureConverter::Init(); TextureConverter::Init();
} }
void Video_Shutdown(void) void Shutdown(void)
{ {
TextureConverter::Shutdown(); TextureConverter::Shutdown();
VertexLoaderManager::Shutdown(); VertexLoaderManager::Shutdown();