Merge pull request #1045 from cxd4/glitch64-includes
[Glitch64] Fix pre-processor errors for non-Android builds besides #ifdef _WIN32.
This commit is contained in:
commit
7b93904d0c
|
@ -17,7 +17,7 @@
|
|||
#include "g3ext.h"
|
||||
#include "glitchmain.h"
|
||||
#include <Glide64/trace.h>
|
||||
#include <Common\Util.h>
|
||||
#include <Common/Util.h>
|
||||
|
||||
#ifdef VPDEBUG
|
||||
#include <IL/il.h>
|
||||
|
|
|
@ -5,14 +5,13 @@ extern "C"
|
|||
{
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <GL/gl.h> /* Header File For The OpenGL Library */
|
||||
#else
|
||||
#if defined(ANDROID) || defined(__ANDROID__)
|
||||
#include <GLES2/gl2.h>
|
||||
#include <GLES2/gl2ext.h>
|
||||
|
||||
typedef unsigned int GLenum;
|
||||
|
||||
#else
|
||||
#include <GL/gl.h> /* Header File For The OpenGL Library */
|
||||
#endif
|
||||
|
||||
#ifndef APIENTRY
|
||||
|
|
Loading…
Reference in New Issue