Changeset 1355 for trunk/source/visualization/OpenGL/include/G4OpenGL.hh

Timestamp:

Jan 7, 2011, 2:45:21 PM (13 years ago)

Author:

garnier

Message:

bug fix

File:

• trunk/source/visualization/OpenGL/include/G4OpenGL.hh (modified) (1 diff)

trunk/source/visualization/OpenGL/include/G4OpenGL.hh

@@ -29 +29 @@
 // G.Barrand.
 
+
 #ifdef G4VIS_BUILD_OPENGL_DRIVER
 
-#ifndef G4OpenGL_h
-#define G4OpenGL_h 
+ #ifndef G4OpenGL_h
+ #define G4OpenGL_h 
 
-#ifdef WIN32
-#include <windows.h>
-#undef min
-#undef max
-#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #undef min
+ #undef max
+ #endif
 
 
-#ifdef G4VIS_USE_OPENGLX
-#  include <GL/gl.h>
-#  include <GL/glu.h>
-#endif
-#ifdef G4VIS_USE_OPENGLXM
-#    include <GL/gl.h>
-#    include <GL/glu.h>
-#endif
-#ifdef G4VIS_USE_OPENGLWIN32
-#    include <GL/gl.h>
-#    include <GL/glu.h>
-#endif
+ #ifdef G4VIS_BUILD_OPENGLX_DRIVER
+ #  include <GL/gl.h>
+ #  include <GL/glu.h>
+ #endif
+
+ #ifdef G4VIS_BUILD_OPENGLXM_DRIVER
+ #    include <GL/gl.h>
+ #    include <GL/glu.h>
+ #endif
+
+ #ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
+ #    include <GL/gl.h>
+ #    include <GL/glu.h>
+ #endif
 //# Do NOT include glx Here ! It has to be done, after all <Qxx...> includes
 //#  include <GL/glx.h>
 
-#ifdef  G4VIS_USE_OPENGLQT
+ #ifdef  G4VIS_BUILD_OPENGLQT_DRIVER
 // Already done in Darwin-g++.gmk
 //#    include <OpenGL/gl.h>
 //#    include <OpenGL/glu.h>
-#include <qgl.h>
-#endif
+ #include <qgl.h>
+ #endif
 
+ #define G4OPENGL_FLT_BIG 1.e20
 
-#define G4OPENGL_FLT_BIG 1.e20
+ #endif
 
 #endif
-
-#endif