Changeset 1355


Ignore:
Timestamp:
Jan 7, 2011, 2:45:21 PM (13 years ago)
Author:
garnier
Message:

bug fix

Location:
trunk/source/visualization/OpenGL/include
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r1348 r1355  
    2929// G.Barrand.
    3030
     31
    3132#ifdef G4VIS_BUILD_OPENGL_DRIVER
    3233
    33 #ifndef G4OpenGL_h
    34 #define G4OpenGL_h
     34 #ifndef G4OpenGL_h
     35 #define G4OpenGL_h
    3536
    36 #ifdef WIN32
    37 #include <windows.h>
    38 #undef min
    39 #undef max
    40 #endif
     37 #ifdef WIN32
     38 #include <windows.h>
     39 #undef min
     40 #undef max
     41 #endif
    4142
    4243
    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
    5558//# Do NOT include glx Here ! It has to be done, after all <Qxx...> includes
    5659//#  include <GL/glx.h>
    5760
    58 #ifdef  G4VIS_USE_OPENGLQT
     61 #ifdef  G4VIS_BUILD_OPENGLQT_DRIVER
    5962// Already done in Darwin-g++.gmk
    6063//#    include <OpenGL/gl.h>
    6164//#    include <OpenGL/glu.h>
    62 #include <qgl.h>
    63 #endif
     65 #include <qgl.h>
     66 #endif
    6467
     68 #define G4OPENGL_FLT_BIG 1.e20
    6569
    66 #define G4OPENGL_FLT_BIG 1.e20
     70 #endif
    6771
    6872#endif
    69 
    70 #endif

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

    r1350 r1355  
    4444#  include <GL/gl.h>
    4545#  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
    4655//# Do NOT include glx Here ! It has to be done, after all <Qxx...> includes
    4756//#  include <GL/glx.h>
    48 #else
    49 #  ifdef __APPLE__ &&  G4VIS_USE_OPENGLQT
    50 // Already done in Qt
     57
     58#ifdef  G4VIS_USE_OPENGLQT
     59// Already done in Darwin-g++.gmk
    5160//#    include <OpenGL/gl.h>
    5261//#    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>
    5863#endif
     64
    5965
    6066#define G4OPENGL_FLT_BIG 1.e20

  • trunk/source/visualization/OpenGL/include/G4OpenGLBitMapStore.hh~

    r1350 r1355  
    4949
    5050#include "G4OpenGL.hh"
    51 #include <GL/gl.h>
    52 #include <GL/glu.h>
    5351
    5452namespace G4OpenGLBitMapStore {
Note: See TracChangeset for help on using the changeset viewer.