mirror of https://github.com/BOINC/boinc.git
- Modified api/boinc_gl.h to use config.h to get correct include path for glut.h
svn path=/trunk/boinc/; revision=4631
This commit is contained in:
parent
b712a3a7af
commit
b05de361df
|
@ -20,6 +20,8 @@
|
||||||
#ifndef H_BOINC_GL
|
#ifndef H_BOINC_GL
|
||||||
#define H_BOINC_GL
|
#define H_BOINC_GL
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
# include <GL/gl.h>
|
# include <GL/gl.h>
|
||||||
# include <GL/glu.h>
|
# include <GL/glu.h>
|
||||||
|
@ -54,8 +56,6 @@
|
||||||
# include <OpenGL/glu.h>
|
# include <OpenGL/glu.h>
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# include "glut.h"
|
|
||||||
/*
|
|
||||||
# if defined(HAVE_GLUT_H)
|
# if defined(HAVE_GLUT_H)
|
||||||
# include "glut.h"
|
# include "glut.h"
|
||||||
# elif defined(HAVE_GL_GLUT_H)
|
# elif defined(HAVE_GL_GLUT_H)
|
||||||
|
@ -65,7 +65,6 @@
|
||||||
# elif defined(HAVE_GLUT_GLUT_H)
|
# elif defined(HAVE_GLUT_GLUT_H)
|
||||||
# include <GLUT/glut.h>
|
# include <GLUT/glut.h>
|
||||||
# endif
|
# endif
|
||||||
*/
|
|
||||||
|
|
||||||
#endif // _WIN32
|
#endif // _WIN32
|
||||||
|
|
||||||
|
|
|
@ -20038,6 +20038,7 @@ Bruce 23 Nov 2004 UTC
|
||||||
client (to optimize benchmarking routines).
|
client (to optimize benchmarking routines).
|
||||||
- Removed un-necessary zip/configure.ac and zip/Makefile and zip/config.h
|
- Removed un-necessary zip/configure.ac and zip/Makefile and zip/config.h
|
||||||
- Added .cvsignore file for zip/ directory.
|
- Added .cvsignore file for zip/ directory.
|
||||||
|
- Modified api/boinc_gl.h to use config.h to get correct include path for glut.h
|
||||||
|
|
||||||
configure.ac
|
configure.ac
|
||||||
Makefile.am
|
Makefile.am
|
||||||
|
@ -20049,3 +20050,6 @@ Bruce 23 Nov 2004 UTC
|
||||||
Makefile (removed)
|
Makefile (removed)
|
||||||
.cvsignore (added)
|
.cvsignore (added)
|
||||||
config.h (shouldn't be here anyway)
|
config.h (shouldn't be here anyway)
|
||||||
|
config.h.in (shouldn't be here anyway)
|
||||||
|
api/
|
||||||
|
boinc_gl.h
|
||||||
|
|
Loading…
Reference in New Issue