goat3d

diff goatview/src/opengl.h @ 93:07c0ec4a410d

[goatview] line endings fix and missing post_redisplay in load_scene
author John Tsiombikas <nuclear@member.fsf.org>
date Sun, 18 May 2014 06:20:20 +0300
parents c1871707c678
children
line diff
     1.1 --- a/goatview/src/opengl.h	Sun May 18 01:19:10 2014 +0300
     1.2 +++ b/goatview/src/opengl.h	Sun May 18 06:20:20 2014 +0300
     1.3 @@ -1,31 +1,31 @@
     1.4 -#ifndef OPENGL_H_
     1.5 -#define OPENGL_H_
     1.6 -
     1.7 -#include <GL/glew.h>
     1.8 -#define QT_NO_OPENGL_ES_2
     1.9 -
    1.10 -#ifdef WIN32
    1.11 -#define WIN32_LEAN_AND_MEAN 1
    1.12 -#include <windows.h>
    1.13 -#undef min
    1.14 -#endif
    1.15 -
    1.16 -#ifdef __APPLE__
    1.17 -#include <OpenGL/gl.h>
    1.18 -#include <OpenGL/glu.h>
    1.19 -#else
    1.20 -#include <GL/gl.h>
    1.21 -#include <GL/glu.h>
    1.22 -#endif
    1.23 -
    1.24 -#ifdef __cplusplus
    1.25 -extern "C" {
    1.26 -#endif
    1.27 -
    1.28 -int init_opengl(void);
    1.29 -
    1.30 -#ifdef __cplusplus
    1.31 -}
    1.32 -#endif
    1.33 -
    1.34 -#endif	/* OPENGL_H_ */
    1.35 +#ifndef OPENGL_H_
    1.36 +#define OPENGL_H_
    1.37 +
    1.38 +#include <GL/glew.h>
    1.39 +#define QT_NO_OPENGL_ES_2
    1.40 +
    1.41 +#ifdef WIN32
    1.42 +#define WIN32_LEAN_AND_MEAN 1
    1.43 +#include <windows.h>
    1.44 +#undef min
    1.45 +#endif
    1.46 +
    1.47 +#ifdef __APPLE__
    1.48 +#include <OpenGL/gl.h>
    1.49 +#include <OpenGL/glu.h>
    1.50 +#else
    1.51 +#include <GL/gl.h>
    1.52 +#include <GL/glu.h>
    1.53 +#endif
    1.54 +
    1.55 +#ifdef __cplusplus
    1.56 +extern "C" {
    1.57 +#endif
    1.58 +
    1.59 +int init_opengl(void);
    1.60 +
    1.61 +#ifdef __cplusplus
    1.62 +}
    1.63 +#endif
    1.64 +
    1.65 +#endif	/* OPENGL_H_ */