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)
This commit is contained in:
parent
bf9578a97a
commit
7fa54e80a5
11
glut_wrap.h
11
glut_wrap.h
@ -1,11 +0,0 @@
|
|||||||
#ifdef HAVE_FREEGLUT
|
|
||||||
#include <GL/freeglut.h>
|
|
||||||
#elif defined __APPLE__
|
|
||||||
#include <GLUT/glut.h>
|
|
||||||
#else
|
|
||||||
#include <GL/glut.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef GLAPIENTRY
|
|
||||||
#define GLAPIENTRY
|
|
||||||
#endif
|
|
11
glxgears.c
11
glxgears.c
@ -19,8 +19,17 @@
|
|||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#ifdef HAVE_FREEGLUT
|
||||||
|
#include <GL/freeglut.h>
|
||||||
|
#elif defined __APPLE__
|
||||||
|
#include <GLUT/glut.h>
|
||||||
|
#else
|
||||||
|
#include <GL/glut.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "glut_wrap.h"
|
#ifndef GLAPIENTRY
|
||||||
|
#define GLAPIENTRY
|
||||||
|
#endif
|
||||||
|
|
||||||
static GLint T0 = 0;
|
static GLint T0 = 0;
|
||||||
static GLint Frames = 0;
|
static GLint Frames = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user