Some cleanup Should affect windows tell me if it does

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1592 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2008-12-19 11:46:52 +00:00
parent 2bb169ce37
commit db15121b5d
12 changed files with 190 additions and 22 deletions

View File

@ -18,6 +18,9 @@
#ifndef _GLINIT_H
#define _GLINIT_H
#if defined GLTEST && GLTEST
#include "nGLUtil.h"
#else
#include "Config.h"
#include "pluginspecs_video.h"
@ -32,7 +35,6 @@
#else // linux basic definitions
#define ARRAYSIZE(A) (sizeof(A)/sizeof((A)[0]))
#if defined(USE_WX) && USE_WX
#include <GL/glew.h>
#include "wx/wx.h"
@ -55,23 +57,6 @@
#include <GL/gl.h>
#endif
#define __inline inline
#include <sys/timeb.h> // ftime(), struct timeb
inline unsigned long timeGetTime()
{
#ifdef _WIN32
_timeb t;
_ftime(&t);
#else
timeb t;
ftime(&t);
#endif
return (unsigned long)(t.time*1000+t.millitm);
}
#endif // linux basic definitions
#ifndef GL_DEPTH24_STENCIL8_EXT // allows FBOs to support stencils
@ -143,5 +128,5 @@ void OpenGL_SwapBuffers();
void OpenGL_SetWindowText(const char *text);
void OpenGL_Shutdown();
void OpenGL_Update();
#endif
#endif