|
Last change
on this file was
18373,
checked in by westram, 4 years ago
|
- reintegrates 'opengl' into 'trunk'
- fixes OPENGL build (using packages from distribution)
- fix several broken .png (1x crash, 16x warnings)
- adds: log:branches/opengl@18367:18372
|
-
Property svn:eol-style set to
native
-
Property svn:keywords set to
Author Date Id Revision
|
|
File size:
1.5 KB
|
| Line | |
|---|
| 1 | // fix missing dependencies on Debian-based systems |
|---|
| 2 | #include <Xm/Xm.h> |
|---|
| 3 | |
|---|
| 4 | // OpenGl Header files |
|---|
| 5 | #define OPEN_GL_WAY_TO_INCLUDE 3 |
|---|
| 6 | // ------------------------------ |
|---|
| 7 | #if (OPEN_GL_WAY_TO_INCLUDE == 1) |
|---|
| 8 | // working on waltz: |
|---|
| 9 | #include <GL/glew.h> |
|---|
| 10 | #include <GL/glut.h> |
|---|
| 11 | #include <GL/glpng.h> |
|---|
| 12 | #ifdef __GLX_glx_h__ |
|---|
| 13 | #error include wrapper define for glx.h already set -- next include will do nothing |
|---|
| 14 | #endif |
|---|
| 15 | // i have not included this file in my version. I replaced glxew.h with glx.h when |
|---|
| 16 | // you mentioned that it was not compiling on your machine and checked in to the repository. --yadhu |
|---|
| 17 | // #include <GL/glx.h> |
|---|
| 18 | #endif // OPEN_GL_WAY_TO_INCLUDE == 1 |
|---|
| 19 | // ------------------------------ |
|---|
| 20 | #if (OPEN_GL_WAY_TO_INCLUDE == 2) |
|---|
| 21 | // working on ralfs machine |
|---|
| 22 | // not workint on waltz : Previous declaration errors because |
|---|
| 23 | // GLwMDrawA.h includes glx.h and/or glxew.h files |
|---|
| 24 | #include <GL/glew.h> |
|---|
| 25 | #include <GL/glut.h> |
|---|
| 26 | #include <GL/glpng.h> |
|---|
| 27 | #include <GL/glxew.h> |
|---|
| 28 | #endif // OPEN_GL_WAY_TO_INCLUDE == 2 |
|---|
| 29 | // ------------------------------ |
|---|
| 30 | #if (OPEN_GL_WAY_TO_INCLUDE == 3) |
|---|
| 31 | // working on ralfs machine |
|---|
| 32 | // working on waltz too |
|---|
| 33 | #include <GL/glew.h> |
|---|
| 34 | #ifdef DARWIN |
|---|
| 35 | #include <GLUT/glut.h> |
|---|
| 36 | #else |
|---|
| 37 | #include <GL/glut.h> |
|---|
| 38 | #endif |
|---|
| 39 | #include <GL/glpng.h> |
|---|
| 40 | |
|---|
| 41 | // @@@ HACK @@@ |
|---|
| 42 | // including glew.h does define the include wrapper used by glx.h |
|---|
| 43 | // so including glx.h does includes nothing and symbols are missing. |
|---|
| 44 | // Undefining it here does the job: |
|---|
| 45 | #undef __GLX_glx_h__ |
|---|
| 46 | #include <GL/glx.h> |
|---|
| 47 | #endif // OPEN_GL_WAY_TO_INCLUDE == 3 |
|---|
| 48 | // ------------------------------ |
|---|
| 49 | |
|---|
| 50 | #ifndef GLAPI |
|---|
| 51 | #define GLAPI extern |
|---|
| 52 | #endif |
|---|
| 53 | #include <GL/GLwMDrawA.h> |
|---|
Note: See
TracBrowser
for help on using the repository browser.
