From 9f4a5ae6525c7ad45c5871cb8cc9081e733aecff Mon Sep 17 00:00:00 2001 From: wandererfan Date: Tue, 17 Jul 2018 07:59:30 -0400 Subject: [PATCH] Fix includes for M_PI on Win Fix missing ImportExport --- src/Mod/Import/App/dxf.cpp | 6 +++++- src/Mod/Import/App/dxf.h | 2 +- src/Mod/TechDraw/Gui/PreCompiled.h | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Mod/Import/App/dxf.cpp b/src/Mod/Import/App/dxf.cpp index 5b8b8b217d..4a05052a06 100644 --- a/src/Mod/Import/App/dxf.cpp +++ b/src/Mod/Import/App/dxf.cpp @@ -4,9 +4,13 @@ // modified 2018 wandererfan #include "PreCompiled.h" -#include + +//required by windows for M_PI definition +#define _USE_MATH_DEFINES #include +#include + #include #include #include diff --git a/src/Mod/Import/App/dxf.h b/src/Mod/Import/App/dxf.h index dd9a44f272..9349a2cc97 100644 --- a/src/Mod/Import/App/dxf.h +++ b/src/Mod/Import/App/dxf.h @@ -121,7 +121,7 @@ struct LWPolyDataOut }; //******************** -class CDxfWrite{ +class ImportExport CDxfWrite{ private: std::ofstream* m_ofs; bool m_fail; diff --git a/src/Mod/TechDraw/Gui/PreCompiled.h b/src/Mod/TechDraw/Gui/PreCompiled.h index d375b0c7ea..cafd404dce 100644 --- a/src/Mod/TechDraw/Gui/PreCompiled.h +++ b/src/Mod/TechDraw/Gui/PreCompiled.h @@ -33,11 +33,13 @@ # define PartExport __declspec(dllimport) # define TechDrawGuiExport __declspec(dllexport) # define SpreadsheetExport __declspec(dllimport) +# define ImportExport __declspec(dllimport) #else // for Linux # define TechDrawExport # define PartExport # define TechDrawGuiExport # define SpreadsheetExport +# define ImportExport #endif #ifdef _MSC_VER