OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-06 18:26:22 +03:00
Code Packages Releases Activity

0023715: Generated cmake files should link against Cocoa on Mac OS X

Browse Source 
Replace inclusion of GL/glu.h header with OpenGl_GlCore11.hxx wrapper
GL/glu.h doesn't exists on Mac OS X without XQuartz 3rd-party library
This commit is contained in:
kgv 2013-01-22 11:42:43 +04:00
parent dac04bfa38
commit cfd5fa01e8
14 changed files with 72 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/NIS/NIS_DrawList.cxx
View File

@ -21,10 +21,7 @@
#include <NIS_Drawer.hxx>
#include <NIS_View.hxx>
#ifdef WNT
#include <windows.h>
#endif
#include <GL/gl.h>
#include <OpenGl_GlCore11.hxx>
//=======================================================================
//function : NIS_DrawList()

5
src/NIS/NIS_SurfaceDrawer.cxx
View File

@ -23,10 +23,7 @@
#include <NIS_InteractiveObject.hxx>
#include <Standard_ProgramError.hxx>
#ifdef WNT
#include <windows.h>
#endif
#include <GL/gl.h>
#include <OpenGl_GlCore11.hxx>
static void setColor(GLenum theFace,
Quantity_Parameter * theAmbient,

6
src/NIS/NIS_TriangulatedDrawer.cxx
View File

@ -24,10 +24,8 @@
#ifdef _DEBUG
#include <Standard_ProgramError.hxx>
#endif
#ifdef WNT
#include <windows.h>
#endif
#include <GL/gl.h>
#include <OpenGl_GlCore11.hxx>
// Comment this line if you see no hilighting of triangulations due to negative
// polygon offsets. Disabling this macro means that all offsets will be created

6
src/NIS/NIS_View.cxx
View File

@ -25,10 +25,8 @@
#include <Visual3d_View.hxx>
#include <Bnd_B2f.hxx>
#include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
#ifdef WNT
#include <Windows.h>
#endif
#include <GL/gl.h>
#include <OpenGl_GlCore11.hxx>
IMPLEMENT_STANDARD_HANDLE (NIS_View, V3d_OrthographicView)
IMPLEMENT_STANDARD_RTTIEXT (NIS_View, V3d_OrthographicView)

2
src/OpenGl/OpenGl_GraduatedTrihedron.cxx
View File

@ -29,8 +29,6 @@
#include <InterfaceGraphic_Aspect.hxx>
#include <InterfaceGraphic_Visual3d.hxx>
#include <GL/glu.h> // gluUnProject()
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

2
src/OpenGl/OpenGl_GraphicDriver_Layer.cxx
View File

@ -28,8 +28,6 @@
#include <OpenGl_AspectText.hxx>
#include <OpenGl_TextParam.hxx>
#include <GL/glu.h>
/*----------------------------------------------------------------------*/
struct OpenGl_LAYER_PROP

2
src/OpenGl/OpenGl_Polygon.cxx
View File

@ -27,8 +27,6 @@
#include <OpenGl_Structure.hxx>
#include <OpenGl_Workspace.hxx>
#include <GL/glu.h>
#if (defined(_WIN32) || defined(__WIN32__))
#define STATIC
#else

2
src/OpenGl/OpenGl_Text.cxx
View File

@ -23,8 +23,6 @@
#include <OpenGl_Structure.hxx>
#include <OpenGl_Workspace.hxx>
#include <GL/glu.h> // gluUnProject()
/*----------------------------------------------------------------------*/
OpenGl_Text::OpenGl_Text (const TCollection_ExtendedString& AText,

2
src/OpenGl/OpenGl_Trihedron.cxx
View File

@ -34,8 +34,6 @@
#include <OpenGl_View.hxx>
#include <OpenGl_Trihedron.hxx>
#include <GL/glu.h> // gluNewQuadric()
IMPLEMENT_STANDARD_HANDLE(OpenGl_Trihedron,MMgt_TShared)
IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Trihedron,MMgt_TShared)

2
src/OpenGl/OpenGl_View.cxx
View File

@ -32,8 +32,6 @@
#include <Graphic3d_TextureEnv.hxx>
#include <GL/glu.h> // gluUnProject()
IMPLEMENT_STANDARD_HANDLE(OpenGl_View,MMgt_TShared)
IMPLEMENT_STANDARD_RTTIEXT(OpenGl_View,MMgt_TShared)

2
src/OpenGl/OpenGl_View_1.cxx
View File

@ -28,8 +28,6 @@
#include <OpenGl_PrinterContext.hxx>
#include <OpenGl_Workspace.hxx>
#include <GL/glu.h> // gluProject(), gluUnProject()
/*----------------------------------------------------------------------*/
//TelProjectionRaster in OpenGl_telem_util.cxx

2
src/OpenGl/OpenGl_View_2.cxx
View File

@ -35,8 +35,6 @@
#include <OpenGl_PrinterContext.hxx>
#include <OpenGl_Structure.hxx>
#include <GL/glu.h> // gluBuild2DMipmaps()
#define EPSI 0.0001
static const GLfloat default_amb[4] = { 0.F, 0.F, 0.F, 1.F };

4
src/OpenGl/OpenGl_Window.cxx
View File

@ -17,6 +17,8 @@
// purpose or non-infringement. Please see the License for the specific terms
// and conditions governing the rights and limitations under the License.
#include <OpenGl_GlCore11.hxx>
#include <InterfaceGraphic.hxx>
#include <OpenGl_Window.hxx>
@ -27,8 +29,6 @@
#include <Aspect_GraphicDeviceDefinitionError.hxx>
#include <TCollection_AsciiString.hxx>
#include <GL/glu.h> // gluOrtho2D()
IMPLEMENT_STANDARD_HANDLE(OpenGl_Window,MMgt_TShared)
IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Window,MMgt_TShared)

2
src/OpenGl/OpenGl_Workspace_2.cxx
View File

@ -43,8 +43,6 @@
#include <OpenGl_View.hxx>
#include <OpenGl_Display.hxx>
#include <GL/glu.h> // gluOrtho2D()
//10-05-96 : CAL ; Ajout d'un nouveau delta dans les copies de pixels (voir CALL_DEF_DELTA)
#define CALL_DEF_DELTA 10