Part: include header with export macros

2022-03-24 21:02:01 +01:00
parent 5bab6fb189
commit 2ef7af2ead
21 changed files with 29 additions and 26 deletions
--- a/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h
+++ b/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h
@@ -24,6 +24,7 @@
 #ifndef PART_BREPOFFSETAPI_MAKEOFFSETFIX_H
 #define PART_BREPOFFSETAPI_MAKEOFFSETFIX_H

+#include <Mod/Part/PartGlobal.h>
 #include <BRepOffsetAPI_MakeOffset.hxx>
 #include <list>
 #include <map>
--- a/src/Mod/Part/App/CrossSection.h
+++ b/src/Mod/Part/App/CrossSection.h
@@ -24,6 +24,7 @@
 #ifndef PART_CROSSSECTION_H
 #define PART_CROSSSECTION_H

+#include <Mod/Part/PartGlobal.h>
 #include <list>
 #include <TopTools_IndexedMapOfShape.hxx>

--- a/src/Mod/Part/App/ExtrusionHelper.h
+++ b/src/Mod/Part/App/ExtrusionHelper.h
@@ -28,6 +28,7 @@
 #include <vector>
 #include <gp_Dir.hxx>
 #include <TopoDS_Shape.hxx>
+#include <Mod/Part/PartGlobal.h>

 namespace Part
 {
--- a/src/Mod/Part/App/FaceMaker.h
+++ b/src/Mod/Part/App/FaceMaker.h
@@ -30,6 +30,7 @@
 #include <TopoDS_Wire.hxx>

 #include <memory>
+#include <Mod/Part/PartGlobal.h>

 namespace Part
 {
--- a/src/Mod/Part/App/GeometryExtension.h
+++ b/src/Mod/Part/App/GeometryExtension.h
@@ -25,6 +25,7 @@
 #define PART_GEOMETRYEXTENSION_H

 #include <Base/Persistence.h>
+#include <Mod/Part/PartGlobal.h>
 #include <memory>
 #include <string>

--- a/src/Mod/Part/App/ImportIges.h
+++ b/src/Mod/Part/App/ImportIges.h
@@ -24,6 +24,7 @@
 #ifndef PART_IMPORT_IGES_H
 #define PART_IMPORT_IGES_H

+#include <Mod/Part/PartGlobal.h>
 #include <TopoDS_Shape.hxx>

 namespace App {
--- a/src/Mod/Part/App/ImportStep.h
+++ b/src/Mod/Part/App/ImportStep.h
@@ -27,6 +27,7 @@
 #define _ImportStep_h_

 #include <TopoDS_Shape.hxx>
+#include <Mod/Part/PartGlobal.h>
 #include <App/ComplexGeoData.h>

 namespace App {
--- a/src/Mod/Part/App/OCCError.h
+++ b/src/Mod/Part/App/OCCError.h
@@ -54,6 +54,7 @@
 # include <Standard_TypeMismatch.hxx>
 # include <Standard_Underflow.hxx>

+#include <Mod/Part/PartGlobal.h>
 #include <Base/Console.h>
 #include <Base/PyObjectBase.h>
 #include <Base/Interpreter.h>
--- a/src/Mod/Part/App/PreCompiled.h
+++ b/src/Mod/Part/App/PreCompiled.h
@@ -26,16 +26,7 @@

 #include <FCConfig.h>

-
-// Exporting of App classes
-#ifdef FC_OS_WIN32
-# define PartExport __declspec(dllexport)
-#else // for Linux
-# define PartExport
-#endif
-
-//needed to make autogenerated Py interface source code to compile
-#define AttacherExport PartExport
+#include <Mod/Part/PartGlobal.h>

 // here get the warnings of too long specifiers disabled (needed for VC6)
 #ifdef _MSC_VER
--- a/src/Mod/Part/App/PrismExtension.h
+++ b/src/Mod/Part/App/PrismExtension.h
@@ -23,6 +23,7 @@
 #ifndef PART_PRISM_EXTENSION_H
 #define PART_PRISM_EXTENSION_H

+#include <Mod/Part/PartGlobal.h>
 #include <App/DocumentObjectExtension.h>
 #include <App/PropertyUnits.h>
 #include <TopoDS_Face.hxx>
--- a/src/Mod/Part/App/ProgressIndicator.h
+++ b/src/Mod/Part/App/ProgressIndicator.h
@@ -27,6 +27,7 @@
 #include <Message_ProgressIndicator.hxx>
 #include <Standard_Version.hxx>
 #include <Base/Sequencer.h>
+#include <Mod/Part/PartGlobal.h>
 #include <memory>

 namespace Part {
--- a/src/Mod/Part/App/edgecluster.h
+++ b/src/Mod/Part/App/edgecluster.h
@@ -24,6 +24,7 @@
 #ifndef PART_EDGECLUSTER_H
 #define PART_EDGECLUSTER_H

+#include <Mod/Part/PartGlobal.h>
 #include <gp_Pnt.hxx>
 #include <TopoDS_Edge.hxx>
 #include <vector>
--- a/src/Mod/Part/App/modelRefine.h
+++ b/src/Mod/Part/App/modelRefine.h
@@ -38,6 +38,7 @@
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <BRepBuilderAPI_MakeShape.hxx>
+#include <Mod/Part/PartGlobal.h>


 namespace ModelRefine
--- a/src/Mod/Part/Gui/PreCompiled.h
+++ b/src/Mod/Part/Gui/PreCompiled.h
@@ -26,20 +26,7 @@

 #include <FCConfig.h>

-// Importing of App classes
-#ifdef FC_OS_WIN32
-# define PartExport    __declspec(dllimport)
-# define PartGuiExport __declspec(dllexport)
-#else // for Linux
-# define PartExport
-# define PartGuiExport
-#endif
-
-#ifdef FC_OS_WIN32
-# ifndef NOMINMAX
-# define NOMINMAX
-# endif
-#endif
+#include <Mod/Part/PartGlobal.h>

 // here get the warnings of too long specifiers disabled (needed for VC6)
 #ifdef _MSC_VER
@@ -50,6 +37,9 @@
 #endif

 #ifdef FC_OS_WIN32
+# ifndef NOMINMAX
+# define NOMINMAX
+# endif
 # include <windows.h>
 #endif

--- a/src/Mod/Part/Gui/SoBrepEdgeSet.h
+++ b/src/Mod/Part/Gui/SoBrepEdgeSet.h
@@ -34,6 +34,7 @@
 #include <vector>
 #include <memory>
 #include <Gui/SoFCSelectionContext.h>
+#include <Mod/Part/PartGlobal.h>

 class SoCoordinateElement;
 class SoGLCoordinateElement;
--- a/src/Mod/Part/Gui/SoBrepFaceSet.h
+++ b/src/Mod/Part/Gui/SoBrepFaceSet.h
@@ -34,6 +34,7 @@
 #include <vector>
 #include <memory>
 #include <Gui/SoFCSelectionContext.h>
+#include <Mod/Part/PartGlobal.h>

 class SoGLCoordinateElement;
 class SoTextureCoordinateBundle;
--- a/src/Mod/Part/Gui/SoBrepPointSet.h
+++ b/src/Mod/Part/Gui/SoBrepPointSet.h
@@ -34,6 +34,7 @@
 #include <vector>
 #include <memory>
 #include <Gui/SoFCSelectionContext.h>
+#include <Mod/Part/PartGlobal.h>

 class SoCoordinateElement;
 class SoGLCoordinateElement;
--- a/src/Mod/Part/Gui/SoFCShapeObject.h
+++ b/src/Mod/Part/Gui/SoFCShapeObject.h
@@ -29,6 +29,7 @@
 #include <Inventor/nodes/SoSubNode.h>
 #include <Inventor/nodes/SoShape.h>
 #include <Inventor/elements/SoReplacedElement.h>
+#include <Mod/Part/PartGlobal.h>

 namespace PartGui {

--- a/src/Mod/Part/Gui/ViewProviderAttachExtension.h
+++ b/src/Mod/Part/Gui/ViewProviderAttachExtension.h
@@ -26,6 +26,7 @@

 #include <App/Extension.h>
 #include <Gui/ViewProviderExtensionPython.h>
+#include <Mod/Part/PartGlobal.h>

 namespace PartGui
 {
--- a/src/Mod/Part/Gui/Workbench.h
+++ b/src/Mod/Part/Gui/Workbench.h
@@ -25,6 +25,7 @@
 #define PART_WORKBENCH_H

 #include <Gui/Workbench.h>
+#include <Mod/Part/PartGlobal.h>

 namespace PartGui {

--- a/src/Mod/Part/PartGlobal.h
+++ b/src/Mod/Part/PartGlobal.h
@@ -29,12 +29,16 @@
 // Part
 #ifndef PartExport
 #ifdef Part_EXPORTS
-#       define PartExport   FREECAD_DECL_EXPORT
+#  define PartExport   FREECAD_DECL_EXPORT
 #else
-#       define PartExport   FREECAD_DECL_IMPORT
+#  define PartExport   FREECAD_DECL_IMPORT
 #endif
 #endif

+#ifndef AttacherExport
+#define AttacherExport PartExport
+#endif
+
 // PartGui
 #ifndef PartGuiExport
 #ifdef PartGui_EXPORTS