Permalink
Browse files

Simplified platform-specific OpenGL header inclusion for demo files.

  • Loading branch information...
1 parent bf91bfa commit eaf6b8ac542f9619a2942aa40a0f53866c341af0 @ButchDean ButchDean committed Oct 2, 2014
View
@@ -10,11 +10,7 @@
* software licence.
*/
#include <cstring>
-#ifdef __gnu_linux__
- #include <GL/glut.h>
-#else
- #include <gl/glut.h>
-#endif
+#include "ogl_headers.h"
#include "app.h"
#include "timing.h"
View
@@ -11,11 +11,7 @@
*/
#include <cstdlib>
-#ifdef __gnu_linux__
- #include "../../include/cyclone/cyclone.h"
-#else
- #include <cyclone/cyclone.h>
-#endif
+#include <cyclone/cyclone.h>
/**
* An application is the base class for all demonstration progams.
@@ -10,13 +10,8 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include <GL/glut.h>
- #include "../../../include/cyclone/cyclone.h"
-#else
- #include <gl/glut.h>
- #include <cyclone/cyclone.h>
-#endif
+#include <cyclone/cyclone.h>
+#include "../ogl_headers.h"
#include "../app.h"
#include "../timing.h"
@@ -10,14 +10,8 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include <GL/glut.h>
- #include "../../../include/cyclone/cyclone.h"
-#else
- #include <gl/glut.h>
- #include <cyclone/cyclone.h>
-#endif
-
+#include <cyclone/cyclone.h>
+#include "../ogl_headers.h"
#include "../app.h"
#include "../timing.h"
@@ -10,13 +10,8 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include <GL/glut.h>
- #include "../../../include/cyclone/cyclone.h"
-#else
- #include <gl/glut.h>
- #include <cyclone/cyclone.h>
-#endif
+#include <cyclone/cyclone.h>
+#include "../ogl_headers.h"
#include "../app.h"
#include "../timing.h"
@@ -10,13 +10,8 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include <GL/glut.h>
- #include "../../../include/cyclone/cyclone.h"
-#else
- #include <gl/glut.h>
- #include <cyclone/cyclone.h>
-#endif
+#include <cyclone/cyclone.h>
+#include "../ogl_headers.h"
#include "../app.h"
#include "../timing.h"
@@ -10,13 +10,8 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include <GL/glut.h>
- #include "../../../include/cyclone/cyclone.h"
-#else
- #include <gl/glut.h>
- #include <cyclone/cyclone.h>
-#endif
+#include <cyclone/cyclone.h>
+#include "../ogl_headers.h"
#include "../app.h"
#include "../timing.h"
@@ -10,13 +10,8 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include <GL/glut.h>
- #include "../../../include/cyclone/cyclone.h"
-#else
- #include <gl/glut.h>
- #include <cyclone/cyclone.h>
-#endif
+#include <cyclone/cyclone.h>
+#include "../ogl_headers.h"
#include "../app.h"
#include "../timing.h"
@@ -10,13 +10,8 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include <GL/glut.h>
- #include "../../../include/cyclone/cyclone.h"
-#else
- #include <gl/glut.h>
- #include <cyclone/cyclone.h>
-#endif
+#include <cyclone/cyclone.h>
+#include "../ogl_headers.h"
#include "../app.h"
#include "../timing.h"
@@ -10,13 +10,8 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include <GL/glut.h>
- #include "../../../include/cyclone/cyclone.h"
-#else
- #include <gl/glut.h>
- #include <cyclone/cyclone.h>
-#endif
+#include <cyclone/cyclone.h>
+#include "../ogl_headers.h"
#include "../app.h"
#include "../timing.h"
View
@@ -10,11 +10,8 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include <GL/glut.h>
-#else
- #include <gl/glut.h>
-#endif
+// Include appropriate OpenGL headers.
+#include "ogl_headers.h"
// Include the general application structure.
#include "app.h"
@@ -0,0 +1,10 @@
+#ifndef _OPENGL_HEADERS_
+#define _OPENGL_HEADERS_
+
+#ifdef __gnu_linux__
+ #include <GL/glut.h>
+#else
+ #include <gl/glut.h>
+#endif
+
+#endif // _OPENGL_HEADERS_
@@ -10,13 +10,8 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include <GL/glut.h>
- #include "../../../include/cyclone/cyclone.h"
-#else
- #include <gl/glut.h>
- #include <cyclone/cyclone.h>
-#endif
+#include <cyclone/cyclone.h>
+#include "../ogl_headers.h"
#include "../app.h"
#include "../timing.h"
@@ -10,13 +10,8 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include <GL/glut.h>
- #include "../../../include/cyclone/cyclone.h"
-#else
- #include <gl/glut.h>
- #include <cyclone/cyclone.h>
-#endif
+#include <cyclone/cyclone.h>
+#include "../ogl_headers.h"
#include "../app.h"
#include "../timing.h"
@@ -10,13 +10,8 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include <GL/glut.h>
- #include "../../../include/cyclone/cyclone.h"
-#else
- #include <gl/glut.h>
- #include <cyclone/cyclone.h>
-#endif
+#include <cyclone/cyclone.h>
+#include "../ogl_headers.h"
#include "../app.h"
#include "../timing.h"

0 comments on commit eaf6b8a

Please sign in to comment.