Drawing: include header with export macros

src/Mod/Drawing/App/DrawingExport.h

@@ -26,6 +26,7 @@
 
 #include <string>
 #include <TopoDS_Edge.hxx>
+#include <Mod/Drawing/DrawingGlobal.h>
 
 class TopoDS_Shape;
 class BRepAdaptor_Curve;

src/Mod/Drawing/App/FeatureClip.h

@@ -27,6 +27,7 @@
 
 #include <App/DocumentObjectGroup.h>
 #include <App/PropertyStandard.h>
+#include <Mod/Drawing/DrawingGlobal.h>
 
 namespace Drawing
 {

src/Mod/Drawing/App/FeaturePage.h

@@ -28,6 +28,7 @@
 #include <App/DocumentObjectGroup.h>
 #include <App/PropertyStandard.h>
 #include <App/PropertyFile.h>
+#include <Mod/Drawing/DrawingGlobal.h>
 
 
 namespace Drawing

src/Mod/Drawing/App/FeatureProjection.h

@@ -29,6 +29,7 @@
 #include <App/PropertyStandard.h>
 #include <App/PropertyGeo.h>
 #include <Mod/Part/App/PartFeature.h>
+#include <Mod/Drawing/DrawingGlobal.h>
 
 
 namespace Drawing

src/Mod/Drawing/App/FeatureView.h

@@ -31,6 +31,7 @@
 #include <App/PropertyStandard.h>
 #include <App/PropertyGeo.h>
 #include <App/FeaturePython.h>
+#include <Mod/Drawing/DrawingGlobal.h>
 
 
 namespace Drawing

src/Mod/Drawing/App/PageGroup.h

@@ -30,6 +30,7 @@
 #include <App/DocumentObjectGroup.h>
 #include <App/PropertyStandard.h>
 #include <App/PropertyLinks.h>
+#include <Mod/Drawing/DrawingGlobal.h>
 
 
 namespace Drawing

src/Mod/Drawing/App/PreCompiled.h

@@ -26,19 +26,6 @@
 
 #include <FCConfig.h>
 
-// Exporting of App classes
-#ifdef FC_OS_WIN32
-# define DrawingExport         __declspec(dllexport)
-# define PartExport            __declspec(dllimport)
-# define MeshExport            __declspec(dllimport)
-# define SpreadsheetExport     __declspec(dllimport)
-#else // for Linux
-# define DrawingExport
-# define PartExport
-# define MeshExport
-# define SpreadsheetExport
-#endif
-
 #ifdef _PreComp_
 
 // standard

src/Mod/Drawing/App/ProjectionAlgos.h

@@ -24,8 +24,9 @@
 #ifndef _ProjectionAlgos_h_
 #define _ProjectionAlgos_h_
 
-#include <TopoDS_Shape.hxx>
+#include <Mod/Drawing/DrawingGlobal.h>
 #include <Base/Vector3D.h>
+#include <TopoDS_Shape.hxx>
 #include <string>
 
 class BRepAdaptor_Curve;

src/Mod/Drawing/DrawingGlobal.h

@@ -0,0 +1,47 @@
+/***************************************************************************
+ *   Copyright (c) 2021 Werner Mayer <wmayer[at]users.sourceforge.net>     *
+ *                                                                         *
+ *   This file is part of the FreeCAD CAx development system.              *
+ *                                                                         *
+ *   This library is free software; you can redistribute it and/or         *
+ *   modify it under the terms of the GNU Library General Public           *
+ *   License as published by the Free Software Foundation; either          *
+ *   version 2 of the License, or (at your option) any later version.      *
+ *                                                                         *
+ *   This library  is distributed in the hope that it will be useful,      *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU Library General Public License for more details.                  *
+ *                                                                         *
+ *   You should have received a copy of the GNU Library General Public     *
+ *   License along with this library; see the file COPYING.LIB. If not,    *
+ *   write to the Free Software Foundation, Inc., 59 Temple Place,         *
+ *   Suite 330, Boston, MA  02111-1307, USA                                *
+ *                                                                         *
+ ***************************************************************************/
+
+#include <FCGlobal.h>
+
+#ifndef DRAWING_GLOBAL_H
+#define DRAWING_GLOBAL_H
+
+
+// Drawing
+#ifndef DrawingExport
+#ifdef Drawing_EXPORTS
+#       define DrawingExport   FREECAD_DECL_EXPORT
+#else
+#       define DrawingExport   FREECAD_DECL_IMPORT
+#endif
+#endif
+
+// DrawingGui
+#ifndef DrawingGuiExport
+#ifdef DrawingGui_EXPORTS
+#       define DrawingGuiExport   FREECAD_DECL_EXPORT
+#else
+#       define DrawingGuiExport   FREECAD_DECL_IMPORT
+#endif
+#endif
+
+#endif //DRAWING_GLOBAL_H

src/Mod/Drawing/Gui/DrawingView.h

@@ -25,6 +25,7 @@
 #define DRAWINGGUI_DRAWINGVIEW_H
 
 #include <Gui/MDIView.h>
+#include <Mod/Drawing/DrawingGlobal.h>
 #include <QGraphicsView>
 #include <QPrinter>
 

src/Mod/Drawing/Gui/PreCompiled.h

@@ -26,26 +26,12 @@
 
 #include <FCConfig.h>
 
-// Importing of App classes
-#ifdef FC_OS_WIN32
-//# define DrawingAppExport __declspec(dllimport)
-# define DrawingExport      __declspec(dllimport)
-# define PartExport         __declspec(dllimport)
-# define DrawingGuiExport   __declspec(dllexport)
-# define SpreadsheetExport  __declspec(dllimport)
-#else // for Linux
-# define DrawingExport
-# define PartExport
-# define DrawingGuiExport
-# define SpreadsheetExport
-#endif
-
 #ifdef _MSC_VER
 #   pragma warning(disable : 4005)
 #endif
 
 #ifdef _PreComp_
-
+
 // standard
 #include <iostream>
 #include <cassert>
@@ -71,7 +57,7 @@
 #ifndef __QtAll__
 # include <Gui/QtAll.h>
 #endif
-
+
 #endif //_PreComp_
 
 #endif // DRAWINGGUI_PRECOMPILED_H

src/Mod/Drawing/Gui/Workbench.h

@@ -31,7 +31,7 @@ namespace DrawingGui {
 /**
  * @author Werner Mayer
  */
-class DrawingGuiExport Workbench : public Gui::StdWorkbench
+class Workbench : public Gui::StdWorkbench
 {
     TYPESYSTEM_HEADER();