From bb8dda44f5c0a072517439a11bae61bdfa24e2da Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 24 Mar 2022 20:42:15 +0100 Subject: [PATCH] Mesh: include header with export macros --- src/Mod/Mesh/App/Core/Decimation.h | 1 + src/Mod/Mesh/App/PreCompiled.h | 9 --------- src/Mod/Mesh/Gui/PreCompiled.h | 9 --------- src/Mod/MeshPart/App/CurveProjector.h | 1 + src/Mod/MeshPart/App/PreCompiled.h | 11 ----------- src/Mod/MeshPart/Gui/PreCompiled.h | 17 ----------------- src/Mod/MeshPart/Gui/Workbench.h | 2 +- 7 files changed, 3 insertions(+), 47 deletions(-) diff --git a/src/Mod/Mesh/App/Core/Decimation.h b/src/Mod/Mesh/App/Core/Decimation.h index 8a2b7ff55c..60eb24df7c 100644 --- a/src/Mod/Mesh/App/Core/Decimation.h +++ b/src/Mod/Mesh/App/Core/Decimation.h @@ -24,6 +24,7 @@ #ifndef MESH_DECIMATION_H #define MESH_DECIMATION_H +#include namespace MeshCore { diff --git a/src/Mod/Mesh/App/PreCompiled.h b/src/Mod/Mesh/App/PreCompiled.h index e7d96b7661..a1944774c3 100644 --- a/src/Mod/Mesh/App/PreCompiled.h +++ b/src/Mod/Mesh/App/PreCompiled.h @@ -26,15 +26,6 @@ #include - -// Exporting of App classes -#ifdef FC_OS_WIN32 -# define MeshExport __declspec(dllexport) -#else // for Linux -# define MeshExport -#endif - - // here get the warnings of too long specifiers disabled (needed for VC6) #ifdef _MSC_VER # pragma warning( disable : 4251 ) diff --git a/src/Mod/Mesh/Gui/PreCompiled.h b/src/Mod/Mesh/Gui/PreCompiled.h index f68bbe7181..a90d9e31f9 100644 --- a/src/Mod/Mesh/Gui/PreCompiled.h +++ b/src/Mod/Mesh/Gui/PreCompiled.h @@ -26,15 +26,6 @@ #include -// Importing of App classes -#ifdef FC_OS_WIN32 -# define MeshExport __declspec(dllimport) -# define MeshGuiExport __declspec(dllexport) -#else // for Linux -# define MeshExport -# define MeshGuiExport -#endif - // here get the warnings of too long specifiers disabled (needed for VC6) #ifdef _MSC_VER # pragma warning( disable : 4005 ) diff --git a/src/Mod/MeshPart/App/CurveProjector.h b/src/Mod/MeshPart/App/CurveProjector.h index 5efcd7566d..e74ee014b9 100644 --- a/src/Mod/MeshPart/App/CurveProjector.h +++ b/src/Mod/MeshPart/App/CurveProjector.h @@ -33,6 +33,7 @@ #include #include +#include namespace MeshCore { diff --git a/src/Mod/MeshPart/App/PreCompiled.h b/src/Mod/MeshPart/App/PreCompiled.h index aa3bcdf414..f245301f7e 100644 --- a/src/Mod/MeshPart/App/PreCompiled.h +++ b/src/Mod/MeshPart/App/PreCompiled.h @@ -26,17 +26,6 @@ #include -// Exporting of App classes -#ifdef FC_OS_WIN32 -# define MeshPartExport __declspec(dllexport) -# define PartExport __declspec(dllimport) -# define MeshExport __declspec(dllimport) -#else // for Linux -# define MeshPartExport -# define PartExport -# define MeshExport -#endif - #ifdef _MSC_VER # pragma warning(disable : 4244) # pragma warning(disable : 4275) diff --git a/src/Mod/MeshPart/Gui/PreCompiled.h b/src/Mod/MeshPart/Gui/PreCompiled.h index dc282198ee..70dcb83749 100644 --- a/src/Mod/MeshPart/Gui/PreCompiled.h +++ b/src/Mod/MeshPart/Gui/PreCompiled.h @@ -26,23 +26,6 @@ #include -// Importing of App classes -#ifdef FC_OS_WIN32 -# define MeshExport __declspec(dllimport) -# define PartExport __declspec(dllimport) -# define MeshGuiExport __declspec(dllimport) -# define PartGuiExport __declspec(dllimport) -# define MeshPartAppExport __declspec(dllimport) -# define MeshPartGuiExport __declspec(dllexport) -#else // for Linux -# define MeshExport -# define PartExport -# define MeshGuiExport -# define PartGuiExport -# define MeshPartAppExport -# define MeshPartGuiExport -#endif - #ifdef _MSC_VER # pragma warning(disable : 4005) # pragma warning(disable : 4290) diff --git a/src/Mod/MeshPart/Gui/Workbench.h b/src/Mod/MeshPart/Gui/Workbench.h index 0557cf8351..d25e095740 100644 --- a/src/Mod/MeshPart/Gui/Workbench.h +++ b/src/Mod/MeshPart/Gui/Workbench.h @@ -31,7 +31,7 @@ namespace MeshPartGui { /** * @author Werner Mayer */ -class MeshPartGuiExport Workbench : public Gui::StdWorkbench +class Workbench : public Gui::StdWorkbench { TYPESYSTEM_HEADER();