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

bug fix

File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.