From 0abf467f7e5fe53cbec5814cea8f37d672bb627e Mon Sep 17 00:00:00 2001 From: jriegel Date: Wed, 12 Oct 2011 14:08:52 +0000 Subject: [PATCH] + fix DLL exports in Cam git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5007 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d --- src/Mod/Cam/App/AppCam.cpp | 2 +- src/Mod/Cam/App/Approx.h | 2 +- src/Mod/Cam/App/ChangeDyna.h | 2 +- src/Mod/Cam/App/PreCompiled.h | 8 ++------ src/Mod/Cam/App/SpringbackCorrection.h | 2 +- src/Mod/Cam/App/UniGridApprox.h | 2 +- src/Mod/Cam/App/best_fit.h | 2 +- src/Mod/Cam/App/cutting_tools.h | 2 +- src/Mod/Cam/App/deviation.h | 2 +- src/Mod/Cam/App/mergedata.h | 2 +- src/Mod/Cam/App/path_simulate.h | 2 +- src/Mod/Cam/App/routine.h | 2 +- src/Mod/Cam/Gui/AppCamGui.cpp | 2 +- src/Mod/Cam/Gui/PreCompiled.h | 18 +++++++++--------- src/Mod/Cam/Gui/Workbench.h | 2 +- 15 files changed, 24 insertions(+), 28 deletions(-) diff --git a/src/Mod/Cam/App/AppCam.cpp b/src/Mod/Cam/App/AppCam.cpp index fd9e1448b..ba6be6367 100644 --- a/src/Mod/Cam/App/AppCam.cpp +++ b/src/Mod/Cam/App/AppCam.cpp @@ -37,7 +37,7 @@ PyDoc_STRVAR(module_part_doc, extern "C" { - void AppCamExport initCam() + void CamExport initCam() { // load dependend module try { diff --git a/src/Mod/Cam/App/Approx.h b/src/Mod/Cam/App/Approx.h index 054ee6f32..67fa93054 100644 --- a/src/Mod/Cam/App/Approx.h +++ b/src/Mod/Cam/App/Approx.h @@ -57,7 +57,7 @@ using namespace boost::numeric; In this program, it will be directly converted into a topo surface from the given information */ -class AppCamExport Approximate : protected Routines +class CamExport Approximate : protected Routines { public: Approximate(const MeshCore::MeshKernel &m, std::vector &_Cntrl, std::vector &_KnotU, std::vector &_KnotV, diff --git a/src/Mod/Cam/App/ChangeDyna.h b/src/Mod/Cam/App/ChangeDyna.h index 17de514e4..d5f58afb2 100644 --- a/src/Mod/Cam/App/ChangeDyna.h +++ b/src/Mod/Cam/App/ChangeDyna.h @@ -28,7 +28,7 @@ #include #include -class AppCamExport ChangeDyna +class CamExport ChangeDyna { public: ChangeDyna(); diff --git a/src/Mod/Cam/App/PreCompiled.h b/src/Mod/Cam/App/PreCompiled.h index 3a5531e0a..3086fef44 100644 --- a/src/Mod/Cam/App/PreCompiled.h +++ b/src/Mod/Cam/App/PreCompiled.h @@ -30,18 +30,14 @@ // Exporting of App classes #ifdef FC_OS_WIN32 - # define AppCamExport __declspec(dllexport) + # define CamExport __declspec(dllexport) # define CamExport __declspec(dllexport) - # define AppPartExport __declspec(dllimport) # define PartExport __declspec(dllimport) - # define AppMeshExport __declspec(dllimport) # define MeshExport __declspec(dllimport) #else // for Linux - # define AppCamExport # define CamExport - # define AppPartExport + # define CamExport # define PartExport - # define AppMeshExport # define MeshExport #endif diff --git a/src/Mod/Cam/App/SpringbackCorrection.h b/src/Mod/Cam/App/SpringbackCorrection.h index a1ebe1c45..9901a8784 100644 --- a/src/Mod/Cam/App/SpringbackCorrection.h +++ b/src/Mod/Cam/App/SpringbackCorrection.h @@ -131,7 +131,7 @@ struct MeshPntLess } }; -class AppCamExport SpringbackCorrection : public MeshCore::MeshFacetVisitor +class CamExport SpringbackCorrection : public MeshCore::MeshFacetVisitor { public: /** @brief Constructor */ diff --git a/src/Mod/Cam/App/UniGridApprox.h b/src/Mod/Cam/App/UniGridApprox.h index 28a1eb5b7..17010ef4d 100644 --- a/src/Mod/Cam/App/UniGridApprox.h +++ b/src/Mod/Cam/App/UniGridApprox.h @@ -33,7 +33,7 @@ using namespace boost::numeric; -class AppCamExport UniGridApprox: public Routines +class CamExport UniGridApprox: public Routines { public: UniGridApprox(const MeshCore::MeshKernel &InputMesh, double Tol); diff --git a/src/Mod/Cam/App/best_fit.h b/src/Mod/Cam/App/best_fit.h index 2a0d79219..db4a0798e 100644 --- a/src/Mod/Cam/App/best_fit.h +++ b/src/Mod/Cam/App/best_fit.h @@ -50,7 +50,7 @@ Topo_Shape */ -class AppCamExport best_fit +class CamExport best_fit { public: best_fit(); diff --git a/src/Mod/Cam/App/cutting_tools.h b/src/Mod/Cam/App/cutting_tools.h index b83b0f06d..2bc222f92 100644 --- a/src/Mod/Cam/App/cutting_tools.h +++ b/src/Mod/Cam/App/cutting_tools.h @@ -120,7 +120,7 @@ struct Face_Less Its idea is to provide the basic functionality for cutting CAD surfaces. In this class you can also find functions useful for generating spiral and feature based toolpaths */ -class AppCamExport cutting_tools +class CamExport cutting_tools { public: /**\brief The standard constructor diff --git a/src/Mod/Cam/App/deviation.h b/src/Mod/Cam/App/deviation.h index d0f4cf88b..531d23141 100644 --- a/src/Mod/Cam/App/deviation.h +++ b/src/Mod/Cam/App/deviation.h @@ -31,7 +31,7 @@ #include #include -class AppCamExport Deviation : public SpringbackCorrection +class CamExport Deviation : public SpringbackCorrection { public: Deviation(); diff --git a/src/Mod/Cam/App/mergedata.h b/src/Mod/Cam/App/mergedata.h index 7718526da..50a352820 100644 --- a/src/Mod/Cam/App/mergedata.h +++ b/src/Mod/Cam/App/mergedata.h @@ -29,7 +29,7 @@ #include #include -class AppCamExport MergeData +class CamExport MergeData { public: MergeData(); diff --git a/src/Mod/Cam/App/path_simulate.h b/src/Mod/Cam/App/path_simulate.h index 3dca35330..51652c11a 100644 --- a/src/Mod/Cam/App/path_simulate.h +++ b/src/Mod/Cam/App/path_simulate.h @@ -45,7 +45,7 @@ describes the tool-movement. */ -class AppCamExport path_simulate +class CamExport path_simulate { public: diff --git a/src/Mod/Cam/App/routine.h b/src/Mod/Cam/App/routine.h index 795b701bd..b73a999b6 100644 --- a/src/Mod/Cam/App/routine.h +++ b/src/Mod/Cam/App/routine.h @@ -67,7 +67,7 @@ typedef struct and some NURBS routines from the Nurbs Book or translated from the NURBS Toolbox for MATLAB */ -class AppCamExport Routines +class CamExport Routines { public: // mehrdimensionales Newton-Verfahren mit festem Startwert 0 diff --git a/src/Mod/Cam/Gui/AppCamGui.cpp b/src/Mod/Cam/Gui/AppCamGui.cpp index 23746d186..542fd8cab 100644 --- a/src/Mod/Cam/Gui/AppCamGui.cpp +++ b/src/Mod/Cam/Gui/AppCamGui.cpp @@ -47,7 +47,7 @@ static struct PyMethodDef CamGui_methods[] = extern "C" { - void AppCamGuiExport initCamGui() + void CamGuiExport initCamGui() { if (!Gui::Application::Instance) { diff --git a/src/Mod/Cam/Gui/PreCompiled.h b/src/Mod/Cam/Gui/PreCompiled.h index ac46cf9ea..9230f97df 100644 --- a/src/Mod/Cam/Gui/PreCompiled.h +++ b/src/Mod/Cam/Gui/PreCompiled.h @@ -31,17 +31,17 @@ // Importing of App classes #ifdef FC_OS_WIN32 -# define MeshExport __declspec(dllimport) -# define AppPartExport __declspec(dllimport) -# define AppPartGuiExport __declspec(dllimport) -# define AppCamExport __declspec(dllimport) -# define AppCamGuiExport __declspec(dllexport) +# define MeshExport __declspec(dllimport) +# define PartExport __declspec(dllimport) +# define PartGuiExport __declspec(dllimport) +# define CamExport __declspec(dllimport) +# define CamGuiExport __declspec(dllexport) #else // for Linux # define MeshExport -# define AppPartExport -# define AppPartGuiExport -# define AppCamExport -# define AppCamGuiExport +# define PartExport +# define PartGuiExport +# define CamExport +# define CamGuiExport #endif #ifdef _MSC_VER diff --git a/src/Mod/Cam/Gui/Workbench.h b/src/Mod/Cam/Gui/Workbench.h index 38b11e71d..cc852749b 100644 --- a/src/Mod/Cam/Gui/Workbench.h +++ b/src/Mod/Cam/Gui/Workbench.h @@ -32,7 +32,7 @@ namespace CamGui /** * @author Werner Mayer */ -class AppCamGuiExport Workbench : public Gui::StdWorkbench +class CamGuiExport Workbench : public Gui::StdWorkbench { TYPESYSTEM_HEADER();