From 7fa54e80a54db296b3d3f2574f3090f9e2812bce Mon Sep 17 00:00:00 2001 From: Lexxy Fox Date: Thu, 2 Nov 2023 10:09:26 -0500 Subject: [PATCH] merged glut_wrap.h into glxgears I saw a post yesterday where someone had made a similar fork and they left out glut_wrap.h for unknown reasons and they had ~dozen people involved, so I'm following suit. (peer pressure ftw) --- glut_wrap.h | 11 ----------- glxgears.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 glut_wrap.h diff --git a/glut_wrap.h b/glut_wrap.h deleted file mode 100644 index b840af9..0000000 --- a/glut_wrap.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifdef HAVE_FREEGLUT - #include -#elif defined __APPLE__ - #include -#else - #include -#endif - -#ifndef GLAPIENTRY - #define GLAPIENTRY -#endif \ No newline at end of file diff --git a/glxgears.c b/glxgears.c index 2eaf818..503b63b 100644 --- a/glxgears.c +++ b/glxgears.c @@ -19,8 +19,17 @@ #include #include #include +#ifdef HAVE_FREEGLUT + #include +#elif defined __APPLE__ + #include +#else + #include +#endif -#include "glut_wrap.h" +#ifndef GLAPIENTRY + #define GLAPIENTRY +#endif static GLint T0 = 0; static GLint Frames = 0;