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

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:
zilmar 2016-03-27 07:31:03 +11:00
parent 1bc965d036 0d3d42c7f9
commit 7b93904d0c
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Glitch64/OGLglitchmain.cpp
View File

@ -17,7 +17,7 @@
#include "g3ext.h" #include "g3ext.h"
#include "glitchmain.h" #include "glitchmain.h"
#include <Glide64/trace.h> #include <Glide64/trace.h>
#include <Common\Util.h> #include <Common/Util.h>
#ifdef VPDEBUG #ifdef VPDEBUG
#include <IL/il.h> #include <IL/il.h>

7
Source/Glitch64/opengl.h
View File

@ -5,14 +5,13 @@ extern "C"
{ {
#endif #endif
#ifdef _WIN32 #if defined(ANDROID) || defined(__ANDROID__)
#include <GL/gl.h> /* Header File For The OpenGL Library */
#else
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
typedef unsigned int GLenum; typedef unsigned int GLenum;
#else
#include <GL/gl.h> /* Header File For The OpenGL Library */
#endif #endif
#ifndef APIENTRY #ifndef APIENTRY