mirror of https://github.com/BOINC/boinc.git
*** empty log message ***
svn path=/trunk/boinc/; revision=4823
This commit is contained in:
parent
9c968d3c2f
commit
4e2d808e1b
|
@ -20,7 +20,6 @@
|
||||||
#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>
|
||||||
|
@ -33,6 +32,7 @@
|
||||||
# include "GLUT/glut.h"
|
# include "GLUT/glut.h"
|
||||||
|
|
||||||
#else // !_WIN32, !__APPLE_CC__
|
#else // !_WIN32, !__APPLE_CC__
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
# if defined(HAVE_GL_H)
|
# if defined(HAVE_GL_H)
|
||||||
# include <gl.h>
|
# include <gl.h>
|
||||||
|
|
|
@ -17,11 +17,11 @@
|
||||||
// Contributor(s):
|
// Contributor(s):
|
||||||
//
|
//
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include "boinc_win.h"
|
#include "boinc_win.h"
|
||||||
|
extern "C"{
|
||||||
#include "jpeglib.h"
|
#include "jpeglib.h"
|
||||||
|
}
|
||||||
#include "bmplib.h"
|
#include "bmplib.h"
|
||||||
#include "tgalib.h"
|
#include "tgalib.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -39,8 +39,6 @@ extern "C"{
|
||||||
|
|
||||||
#include "boinc_gl.h"
|
#include "boinc_gl.h"
|
||||||
|
|
||||||
//#include <GLUT/glut.h>
|
|
||||||
|
|
||||||
#include "gutil.h"
|
#include "gutil.h"
|
||||||
#include "filesys.h"
|
#include "filesys.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
Loading…
Reference in New Issue