piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

[GLExtensions] Remove a bunch of unneeded headers. Fix Linux+EGL compiling. Move include to glx.h around to work around it including global GL/gl.h

Browse Source
This commit is contained in:
Ryan Houdek
2014-01-13 03:14:09 -06:00
committed by degasus
parent 6cdb05b633
commit 3d4d3f6b11
6 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DolphinWX/GLInterface.h
View File

@ -10,12 +10,7 @@
#else
#include "Thread.h"
#ifdef ANDROID
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <EGL/egl.h>
#include "GLInterface/EGL.h"
#elif defined(USE_EGL) && USE_EGL
#if defined(USE_EGL) && USE_EGL
#include "GLInterface/EGL.h"
#elif defined(__APPLE__)
#include "GLInterface/AGL.h"
@ -23,10 +18,12 @@
#include "GLInterface/WGL.h"
#elif defined(HAVE_X11) && HAVE_X11
#include "GLInterface/GLX.h"
#include <GL/glx.h>
#else
#error Platform doesnt have a GLInterface
#endif
typedef struct {
#if defined(USE_EGL) && USE_EGL // This is currently a X11/EGL implementation for desktop
int screen;