Mercurial > fife-parpg

comparison engine/core/video/opengl/fife_opengl.h @ 661:e3140f01749d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Merged the light branch back into trunk. * Modified the demos so they work with the new loaders and setting.
author helios2000@33b003aa-7bff-0310-803a-e67f0ece8222
date Fri, 05 Nov 2010 15:21:10 +0000
parents 853d25234671
children 1ed5b5a0e7e3
comparison
equal deleted inserted replaced
660:b0733d998d0f 661:e3140f01749d
27 // Platform specific includes 27 // Platform specific includes
28 // Linux 28 // Linux
29 #if defined( __unix__ ) 29 #if defined( __unix__ )
30 #include <GL/gl.h> 30 #include <GL/gl.h>
31 #include <GL/glu.h> 31 #include <GL/glu.h>
32 #include <GL/glext.h>
32 #endif 33 #endif
33 34
34 // Win32 35 // Win32
35 #if defined( WIN32 ) 36 #if defined( WIN32 )
36 // MSVC 37 // MSVC
37 #if defined( _MSC_VER ) 38 #if defined( _MSC_VER )
38 #include <windows.h> 39 #include <windows.h>
39 #include <GL/gl.h> 40 #include <GL/gl.h>
40 #include <GL/glu.h> 41 #include <GL/glu.h>
42 #include <GL/glext.h>
41 #undef DELETE 43 #undef DELETE
42 // MinGW 44 // MinGW
43 #else 45 #else
44 #include <GL/gl.h> 46 #include <GL/gl.h>
45 #include <GL/glu.h> 47 #include <GL/glu.h>
48 #include <GL/glext.h>
46 #endif 49 #endif
47 #endif 50 #endif
48 51
49 // Macintosh 52 // Macintosh
50 #if defined( __APPLE_CC__ ) 53 #if defined( __APPLE_CC__ )
51 #include <OpenGL/gl.h> 54 #include <OpenGL/gl.h>
52 #include <OpenGL/glu.h> 55 #include <OpenGL/glu.h>
56 #include <OpenGL/glext.h>
53 #endif 57 #endif
54 58
55 // 3rd party library includes 59 // 3rd party library includes
56 60
57 // FIFE includes 61 // FIFE includes