Sketcher: include header with export macros

2022-03-24 21:09:14 +01:00
parent b011661100
commit 72cf783493
12 changed files with 9 additions and 29 deletions
--- a/src/Mod/Sketcher/App/ExternalGeometryExtension.h
+++ b/src/Mod/Sketcher/App/ExternalGeometryExtension.h
@@ -24,6 +24,7 @@
 #define SKETCHER_EXTERNALGEOMETRYEXTENSION_H

 #include <Mod/Part/App/Geometry.h>
+#include <Mod/Sketcher/SketcherGlobal.h>
 #include <array>
 #include <bitset>

--- a/src/Mod/Sketcher/App/PreCompiled.h
+++ b/src/Mod/Sketcher/App/PreCompiled.h
@@ -26,19 +26,6 @@

 #include <FCConfig.h>

-// Exporting of App classes
-#ifdef FC_OS_WIN32
-# define SketcherExport     __declspec(dllexport)
-# define PartExport         __declspec(dllimport)
-# define PartDesignExport   __declspec(dllimport)
-# define MeshExport         __declspec(dllimport)
-#else // for Linux
-# define SketcherExport
-# define PartExport
-# define PartDesignExport
-# define MeshExport
-#endif
-
 #ifdef _PreComp_

 // standard
--- a/src/Mod/Sketcher/App/SketchAnalysis.h
+++ b/src/Mod/Sketcher/App/SketchAnalysis.h
@@ -29,7 +29,6 @@
 #include <memory>
 #include <Base/Vector3D.h>
 #include "Analyse.h"
-#include "SketchObject.h"

 namespace Sketcher {

--- a/src/Mod/Sketcher/App/SketchGeometryExtension.h
+++ b/src/Mod/Sketcher/App/SketchGeometryExtension.h
@@ -24,6 +24,7 @@
 #define SKETCHER_SKETCHGEOMETRYEXTENSION_H

 #include <Mod/Part/App/Geometry.h>
+#include <Mod/Sketcher/SketcherGlobal.h>
 #include <atomic>
 #include <bitset>
 #include <array>
--- a/src/Mod/Sketcher/App/SketchObjectSF.h
+++ b/src/Mod/Sketcher/App/SketchObjectSF.h
@@ -29,6 +29,7 @@
 #include <App/PropertyFile.h>

 #include <Mod/Part/App/Part2DObject.h>
+#include <Mod/Sketcher/SketcherGlobal.h>

 namespace Sketcher
 {
--- a/src/Mod/Sketcher/App/SolverGeometryExtension.h
+++ b/src/Mod/Sketcher/App/SolverGeometryExtension.h
@@ -24,6 +24,7 @@
 #define SKETCHER_SOLVERGEOMETRYEXTENSION_H

 #include <Mod/Part/App/GeometryExtension.h>
+#include <Mod/Sketcher/SketcherGlobal.h>

 namespace Sketcher
 {
--- a/src/Mod/Sketcher/Gui/PreCompiled.h
+++ b/src/Mod/Sketcher/Gui/PreCompiled.h
@@ -26,21 +26,6 @@

 #include <FCConfig.h>

-// Importing of App classes
-#ifdef FC_OS_WIN32
-# define SketcherExport    __declspec(dllimport)
-# define PartExport        __declspec(dllimport)
-# define PartGuiExport     __declspec(dllimport)
-# define SketcherGuiExport __declspec(dllexport)
-#else // for Linux
-# define SketcherExport
-# define PartExport
-# define PartAppExport
-# define PartGuiExport
-# define SketcherGuiExport
-#endif
-
-
 #ifdef _MSC_VER
 #   pragma warning(disable : 4005)
 #endif
--- a/src/Mod/Sketcher/Gui/SketchOrientationDialog.h
+++ b/src/Mod/Sketcher/Gui/SketchOrientationDialog.h
@@ -25,6 +25,7 @@

 #include <Base/Placement.h>
 #include <QDialog>
+#include <Mod/Sketcher/SketcherGlobal.h>

 namespace SketcherGui {

--- a/src/Mod/Sketcher/Gui/SoDatumLabel.h
+++ b/src/Mod/Sketcher/Gui/SoDatumLabel.h
@@ -37,6 +37,7 @@
 #include <Inventor/fields/SoMFVec3f.h>
 #include <Inventor/SbBox3f.h>
 #include <Inventor/fields/SoSFImage.h>
+#include <Mod/Sketcher/SketcherGlobal.h>

 namespace SketcherGui {

--- a/src/Mod/Sketcher/Gui/SoZoomTranslation.h
+++ b/src/Mod/Sketcher/Gui/SoZoomTranslation.h
@@ -26,6 +26,7 @@
 #include <Inventor/nodes/SoTranslation.h>
 #include <Inventor/nodes/SoSubNode.h>
 #include <Inventor/nodes/SoTransformation.h>
+#include <Mod/Sketcher/SketcherGlobal.h>

 namespace SketcherGui {

--- a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.h
@@ -24,6 +24,7 @@
 #define SKETCHER_VIEWPROVIDERSKETCHGEOMETRYEXTENSION_H

 #include <Mod/Part/App/Geometry.h>
+#include <Mod/Sketcher/SketcherGlobal.h>

 namespace SketcherGui {

--- a/src/Mod/Sketcher/Gui/Workbench.h
+++ b/src/Mod/Sketcher/Gui/Workbench.h
@@ -27,6 +27,7 @@
 #include <Gui/Workbench.h>
 #include <Gui/MenuManager.h>
 #include <Gui/ToolBarManager.h>
+#include <Mod/Sketcher/SketcherGlobal.h>

 namespace SketcherGui {