Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-09-27 09:56:08 +00:00
Code Issues Projects Releases Wiki Activity

do not use vgl.h, use glUtil.h

Browse Source
This commit is contained in:
Aaron Culliney 2014-10-07 21:26:50 -07:00
parent 6858e51a75
commit d083fa958f
4 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common.h
View File

@ -56,7 +56,7 @@
#if VIDEO_OPENGL
#include "video/vgl.h"
#include "video_util/glUtil.h"
#else
#define GLenum int
#define glGetError() 0

1
src/video/glinput.c
View File

@ -13,7 +13,6 @@
#include "common.h"
#include "video/glinput.h"
#include "video/vgl.h"
//----------------------------------------------------------------------------
//

1
src/video/glvideo.c
View File

@ -13,7 +13,6 @@
#include "common.h"
#include "video/glinput.h"
#include "video/vgl.h"
#include "video/renderer.h"
#include "video_util/modelUtil.h"

34
src/video/vgl.h
View File

@ -1,34 +0,0 @@
/*
* Apple // emulator for *nix
*
* This software package is subject to the GNU General Public License
* version 2 or later (your choice) as published by the Free Software
* Foundation.
*
* THERE ARE NO WARRANTIES WHATSOEVER.
*
*/
// OpenGL header includes
// #define USE_GL3W
#if defined(__APPLE__)
# include <TargetConditionals.h>
# if TARGET_OS_MAC
# include <OpenGL/OpenGL.h>
# include <OpenGL/gl3.h>
# else
# include <OpenGLES/ES2/gl.h>
# include <OpenGLES/ES2/glext.h>
# endif
#elif defined(USE_GL3W)
# include <GL3/gl3.h>
# include <GL3/gl3w.h>
#else
# define GLEW_STATIC
# include <GL/glew.h>
# define FREEGLUT_STATIC
# include <GL/freeglut.h>
#endif