Changeset 1355 for trunk/source/visualization/OpenGL
- Timestamp:
- Jan 7, 2011, 2:45:21 PM (14 years ago)
- Location:
- trunk/source/visualization/OpenGL/include
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/OpenGL/include/G4OpenGL.hh
r1348 r1355 29 29 // G.Barrand. 30 30 31 31 32 #ifdef G4VIS_BUILD_OPENGL_DRIVER 32 33 33 #ifndef G4OpenGL_h34 #define G4OpenGL_h34 #ifndef G4OpenGL_h 35 #define G4OpenGL_h 35 36 36 #ifdef WIN3237 #include <windows.h>38 #undef min39 #undef max40 #endif37 #ifdef WIN32 38 #include <windows.h> 39 #undef min 40 #undef max 41 #endif 41 42 42 43 43 #ifdef G4VIS_USE_OPENGLX 44 # include <GL/gl.h> 45 # include <GL/glu.h> 46 #endif 47 #ifdef G4VIS_USE_OPENGLXM 48 # include <GL/gl.h> 49 # include <GL/glu.h> 50 #endif 51 #ifdef G4VIS_USE_OPENGLWIN32 52 # include <GL/gl.h> 53 # include <GL/glu.h> 54 #endif 44 #ifdef G4VIS_BUILD_OPENGLX_DRIVER 45 # include <GL/gl.h> 46 # include <GL/glu.h> 47 #endif 48 49 #ifdef G4VIS_BUILD_OPENGLXM_DRIVER 50 # include <GL/gl.h> 51 # include <GL/glu.h> 52 #endif 53 54 #ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER 55 # include <GL/gl.h> 56 # include <GL/glu.h> 57 #endif 55 58 //# Do NOT include glx Here ! It has to be done, after all <Qxx...> includes 56 59 //# include <GL/glx.h> 57 60 58 #ifdef G4VIS_USE_OPENGLQT 61 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER 59 62 // Already done in Darwin-g++.gmk 60 63 //# include <OpenGL/gl.h> 61 64 //# include <OpenGL/glu.h> 62 #include <qgl.h>63 #endif65 #include <qgl.h> 66 #endif 64 67 68 #define G4OPENGL_FLT_BIG 1.e20 65 69 66 #define G4OPENGL_FLT_BIG 1.e20 70 #endif 67 71 68 72 #endif 69 70 #endif -
trunk/source/visualization/OpenGL/include/G4OpenGL.hh~
r1350 r1355 44 44 # include <GL/gl.h> 45 45 # include <GL/glu.h> 46 #endif 47 #ifdef G4VIS_USE_OPENGLXM 48 # include <GL/gl.h> 49 # include <GL/glu.h> 50 #endif 51 #ifdef G4VIS_USE_OPENGLWIN32 52 # include <GL/gl.h> 53 # include <GL/glu.h> 54 #endif 46 55 //# Do NOT include glx Here ! It has to be done, after all <Qxx...> includes 47 56 //# include <GL/glx.h> 48 #else 49 # ifdef __APPLE__ &&G4VIS_USE_OPENGLQT50 // Already done in Qt57 58 #ifdef G4VIS_USE_OPENGLQT 59 // Already done in Darwin-g++.gmk 51 60 //# include <OpenGL/gl.h> 52 61 //# include <OpenGL/glu.h> 53 # include <qgl.h> 54 # else 55 # include <GL/gl.h> 56 # include <GL/glu.h> 57 # endif 62 #include <qgl.h> 58 63 #endif 64 59 65 60 66 #define G4OPENGL_FLT_BIG 1.e20 -
trunk/source/visualization/OpenGL/include/G4OpenGLBitMapStore.hh~
r1350 r1355 49 49 50 50 #include "G4OpenGL.hh" 51 #include <GL/gl.h>52 #include <GL/glu.h>53 51 54 52 namespace G4OpenGLBitMapStore {
Note: See TracChangeset
for help on using the changeset viewer.