-
-
Notifications
You must be signed in to change notification settings - Fork 3
/
add_cotire_to_7.4.0.patch
91 lines (84 loc) · 4.46 KB
/
add_cotire_to_7.4.0.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
diff -uraN occt-fd47711/adm/MODULES occt-7.4.0/adm/MODULES
--- occt-fd47711/adm/MODULES 2019-09-29 11:12:58.000000000 +0200
+++ occt-7.4.0/adm/MODULES 2020-08-14 23:26:04.951103900 +0200
@@ -1,7 +1,7 @@
FoundationClasses TKernel TKMath
ModelingData TKG2d TKG3d TKGeomBase TKBRep
-ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
-Visualization TKService TKV3d TKOpenGl TKMeshVS TKIVtk TKD3DHost
+ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKShHealing
+Visualization TKV3d TKOpenGl TKMeshVS TKIVtk TKD3DHost
ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
-DataExchange TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh
+DataExchange TKXSBase TKService TKXCAF TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKSTL TKVRML TKRWMesh
Draw TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
diff -uraN occt-fd47711/src/Aspect/Aspect_DisplayConnection.cxx occt-7.4.0/src/Aspect/Aspect_DisplayConnection.cxx
--- occt-fd47711/src/Aspect/Aspect_DisplayConnection.cxx 2019-09-29 11:12:58.000000000 +0200
+++ occt-7.4.0/src/Aspect/Aspect_DisplayConnection.cxx 2020-08-14 23:26:04.951103900 +0200
@@ -25,7 +25,8 @@
// =======================================================================
Aspect_DisplayConnection::Aspect_DisplayConnection()
{
-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
+#if defined(USE_GRAPHICS)
+//#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
myDisplay = NULL;
myIsOwnDisplay = false;
OSD_Environment anEnv ("DISPLAY");
@@ -40,7 +41,8 @@
// =======================================================================
Aspect_DisplayConnection::~Aspect_DisplayConnection()
{
-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
+#if defined(USE_GRAPHICS)
+//#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
if (myDisplay != NULL
&& myIsOwnDisplay)
{
@@ -49,7 +51,7 @@
#endif
}
-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
+#if defined(USE_GRAPHICS)
// =======================================================================
// function : Aspect_DisplayConnection
// purpose :
diff -uraN occt-fd47711/src/Aspect/Aspect_DisplayConnection.hxx occt-7.4.0/src/Aspect/Aspect_DisplayConnection.hxx
--- occt-fd47711/src/Aspect/Aspect_DisplayConnection.hxx 2019-09-29 11:12:58.000000000 +0200
+++ occt-7.4.0/src/Aspect/Aspect_DisplayConnection.hxx 2020-08-14 23:26:04.951103900 +0200
@@ -20,7 +20,8 @@
#include <TCollection_AsciiString.hxx>
#include <NCollection_DataMap.hxx>
-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
+// #define USE_GRAPHICS FALSE
+#if defined(USE_GRAPHICS)
#include <InterfaceGraphic.hxx>
#endif
@@ -39,7 +40,7 @@
//! Destructor. Close opened connection.
Standard_EXPORT ~Aspect_DisplayConnection();
-#if !defined(_WIN32) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX)) && !defined(__ANDROID__) && !defined(__QNX__)
+#if defined(USE_GRAPHICS)
//! Constructor. Creates connection with display specified in theDisplayName.
//! Display name should be in format "hostname:number" or "hostname:number.screen_number", where:
//! hostname - Specifies the name of the host machine on which the display is physically attached.
diff -uraN occt-fd47711/src/Aspect/Aspect_VKeySet.hxx occt-7.4.0/src/Aspect/Aspect_VKeySet.hxx
--- occt-fd47711/src/Aspect/Aspect_VKeySet.hxx 2019-09-29 11:12:58.000000000 +0200
+++ occt-7.4.0/src/Aspect/Aspect_VKeySet.hxx 2020-08-14 23:29:29.601103900 +0200
@@ -13,6 +13,9 @@
#ifndef _Aspect_VKeySet_HeaderFile
#define _Aspect_VKeySet_HeaderFile
+#ifdef Status
+#undef Status
+#endif
#include <Aspect_VKey.hxx>
diff -uraN occt-fd47711/src/TKService/PACKAGES occt-7.4.0/src/TKService/PACKAGES
--- occt-fd47711/src/TKService/PACKAGES 2019-09-29 11:12:58.000000000 +0200
+++ occt-7.4.0/src/TKService/PACKAGES 2020-08-14 23:31:09.221103900 +0200
@@ -1,6 +1,5 @@
Aspect
InterfaceGraphic
-Xw
Image
Media
WNT