+ fix DLL exports in Cam

git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5007 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
This commit is contained in:
jriegel 2011-10-12 14:08:52 +00:00
parent 5df128b21f
commit 0abf467f7e
15 changed files with 24 additions and 28 deletions

View File

@ -37,7 +37,7 @@ PyDoc_STRVAR(module_part_doc,
extern "C"
{
void AppCamExport initCam()
void CamExport initCam()
{
// load dependend module
try {

View File

@ -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<double> &_Cntrl, std::vector<double> &_KnotU, std::vector<double> &_KnotV,

View File

@ -28,7 +28,7 @@
#include <string>
#include <vector>
class AppCamExport ChangeDyna
class CamExport ChangeDyna
{
public:
ChangeDyna();

View File

@ -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

View File

@ -131,7 +131,7 @@ struct MeshPntLess
}
};
class AppCamExport SpringbackCorrection : public MeshCore::MeshFacetVisitor
class CamExport SpringbackCorrection : public MeshCore::MeshFacetVisitor
{
public:
/** @brief Constructor */

View File

@ -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);

View File

@ -50,7 +50,7 @@
Topo_Shape
*/
class AppCamExport best_fit
class CamExport best_fit
{
public:
best_fit();

View File

@ -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

View File

@ -31,7 +31,7 @@
#include <string.h>
#include <QString>
class AppCamExport Deviation : public SpringbackCorrection
class CamExport Deviation : public SpringbackCorrection
{
public:
Deviation();

View File

@ -29,7 +29,7 @@
#include <QStringList>
#include <vector>
class AppCamExport MergeData
class CamExport MergeData
{
public:
MergeData();

View File

@ -45,7 +45,7 @@
describes the tool-movement.
*/
class AppCamExport path_simulate
class CamExport path_simulate
{
public:

View File

@ -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

View File

@ -47,7 +47,7 @@ static struct PyMethodDef CamGui_methods[] =
extern "C"
{
void AppCamGuiExport initCamGui()
void CamGuiExport initCamGui()
{
if (!Gui::Application::Instance)
{

View File

@ -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

View File

@ -32,7 +32,7 @@ namespace CamGui
/**
* @author Werner Mayer
*/
class AppCamGuiExport Workbench : public Gui::StdWorkbench
class CamGuiExport Workbench : public Gui::StdWorkbench
{
TYPESYSTEM_HEADER();