From d083fa958f4a666cb41f29bb71aa1ee4f9273857 Mon Sep 17 00:00:00 2001 From: Aaron Culliney Date: Tue, 7 Oct 2014 21:26:50 -0700 Subject: [PATCH] do not use vgl.h, use glUtil.h --- src/common.h | 2 +- src/video/glinput.c | 1 - src/video/glvideo.c | 1 - src/video/vgl.h | 34 ---------------------------------- 4 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 src/video/vgl.h diff --git a/src/common.h b/src/common.h index b6c19a36..e6203879 100644 --- a/src/common.h +++ b/src/common.h @@ -56,7 +56,7 @@ #if VIDEO_OPENGL -#include "video/vgl.h" +#include "video_util/glUtil.h" #else #define GLenum int #define glGetError() 0 diff --git a/src/video/glinput.c b/src/video/glinput.c index 58f2e018..0cc1119e 100644 --- a/src/video/glinput.c +++ b/src/video/glinput.c @@ -13,7 +13,6 @@ #include "common.h" #include "video/glinput.h" -#include "video/vgl.h" //---------------------------------------------------------------------------- // diff --git a/src/video/glvideo.c b/src/video/glvideo.c index 2ac76a6e..1f371709 100644 --- a/src/video/glvideo.c +++ b/src/video/glvideo.c @@ -13,7 +13,6 @@ #include "common.h" #include "video/glinput.h" -#include "video/vgl.h" #include "video/renderer.h" #include "video_util/modelUtil.h" diff --git a/src/video/vgl.h b/src/video/vgl.h deleted file mode 100644 index aff366f2..00000000 --- a/src/video/vgl.h +++ /dev/null @@ -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 -# if TARGET_OS_MAC -# include -# include -# else -# include -# include -# endif -#elif defined(USE_GL3W) -# include -# include -#else -# define GLEW_STATIC -# include -# define FREEGLUT_STATIC -# include -#endif -