Commit 53941392 authored by Jan Möbius's avatar Jan Möbius

ObjectType windows libraries need proper dllexports

parent 779b1218
......@@ -24,6 +24,7 @@ link_directories (
if (WIN32)
add_definitions (
-DPLUGINLIBDLL
-DBUILDOBJECTTYPEDLL
-DACGDLL
-DUSEACG
)
......
......@@ -79,7 +79,7 @@ namespace PluginFunctions {
* @param _polylines ( vector returning the source polylines )
* @return false, if no polyline is selected as source
*/
DLLEXPORT
OBJECTTYPEDLLEXPORT
bool getSourcePolylines( std::vector<PolyLine*>& _polylines );
/** \brief Get a pointer to every Polyline which is marked as a target.
......@@ -87,14 +87,14 @@ bool getSourcePolylines( std::vector<PolyLine*>& _polylines );
* @param _polylines ( vector returning the target polylines )
* @return false, if no polyline is selected as target
*/
DLLEXPORT
OBJECTTYPEDLLEXPORT
bool getTargetPolylines( std::vector<PolyLine*>& _polylines );
/** This functions returns the object with the given id if it is a PolyLineObject.
* See get_object( int _identifier , BaseObject*& _object ) for more details.
*/
DLLEXPORT
OBJECTTYPEDLLEXPORT
bool getObject( int _identifier , PolyLineObject*& _object );
/** \brief Get a poly Line from an object.
......@@ -102,7 +102,7 @@ bool getObject( int _identifier , PolyLineObject*& _object );
* @param _object The object should be of type BaseDataObject. If the content is a poly Line, a
* poly line will be returned. Otherwise a NULL pointer is returned.
*/
DLLEXPORT
OBJECTTYPEDLLEXPORT
PolyLine* polyLine( BaseObjectData* _object );
/** \brief Cast an BaseObject to a PolyLineObject if possible
......@@ -110,7 +110,7 @@ PolyLine* polyLine( BaseObjectData* _object );
* @param _object The object should be of type BaseDataObject. If the content is a polyLine, a
* a PolyLineObject is returned. Otherwise a NULL pointer is returned.
*/
DLLEXPORT
OBJECTTYPEDLLEXPORT
PolyLineObject* polyLineObject( BaseObjectData* _object );
/** \brief Get an PolyLineObject from the given id If possible
......@@ -118,7 +118,7 @@ PolyLineObject* polyLineObject( BaseObjectData* _object );
* @param _objectId Id of the requested Object. If the content is a volume, a
* a PolyLineObject is returned. Otherwise a NULL pointer is returned.
*/
DLLEXPORT
OBJECTTYPEDLLEXPORT
PolyLineObject* polyLineObject( int _objectId );
}
......
......@@ -49,14 +49,14 @@
#pragma once
#include <OpenFlipper/common/GlobalDefines.hh>
#include <OpenFlipper/common/ObjectTypeDLLDefines.hh>
#include <OpenFlipper/common/perObjectData.hh>
#include <ACG/Math/VectorT.hh>
#include <vector>
#define BEZSPLINE_DATA "BezierSpline_Data"
class DLLEXPORT PolyLineBezierSplineData : public PerObjectData
class OBJECTTYPEDLLEXPORT PolyLineBezierSplineData : public PerObjectData
{
public:
......
......@@ -49,13 +49,13 @@
#pragma once
#include <OpenFlipper/common/GlobalDefines.hh>
#include <OpenFlipper/common/ObjectTypeDLLDefines.hh>
#include <OpenFlipper/common/perObjectData.hh>
#include <ACG/Math/VectorT.hh>
#define CIRCLE_DATA "Circle_Data"
class DLLEXPORT PolyLineCircleData : public PerObjectData
class OBJECTTYPEDLLEXPORT PolyLineCircleData : public PerObjectData
{
public:
ACG::Vec3d circleCenter_;
......
......@@ -71,7 +71,7 @@
#include <ObjectTypes/PolyLine/PolyLineNodeT.hh>
#include <OpenFlipper/common/GlobalDefines.hh>
#include <OpenFlipper/common/ObjectTypeDLLDefines.hh>
//== TYPEDEFS =================================================================
......@@ -79,7 +79,7 @@
/** This class provides the functionality for all kind of meshes for the framework
*/
class DLLEXPORT PolyLineObject : public BaseObjectData {
class OBJECTTYPEDLLEXPORT PolyLineObject : public BaseObjectData {
friend class TypePolyLinePlugin;
......
......@@ -67,7 +67,7 @@
/** This class provides the functionality for serializing PolyLineObjects including all known object data
*/
class DLLEXPORT PolyLineObjectSerializer
class OBJECTTYPEDLLEXPORT PolyLineObjectSerializer
{
private:
PolyLineObject* instance;
......
......@@ -23,7 +23,8 @@ link_directories (
# generate dllexport macros on windows
if (WIN32)
add_definitions (
-DPLUGINLIBDLL
-DPLUGINLIBDLL
-DBUILDOBJECTTYPEDLL
-DACGDLL
-DUSEACG
)
......
......@@ -80,7 +80,7 @@ namespace PluginFunctions {
* @return false, if no PolylineCollection is selected as source
*/
DLLEXPORT
OBJECTTYPEDLLEXPORT
bool getSourcePolylineCollections( std::vector<PolyLineCollection*>& _polylines );
/** \brief Get a pointer to every Polyline Collection which is marked as a target.
......@@ -89,7 +89,7 @@ bool getSourcePolylineCollections( std::vector<PolyLineCollection*>& _polylines
* @return false, if no PolylineCollection is selected as target
*/
DLLEXPORT
OBJECTTYPEDLLEXPORT
bool getTargetPolylineCollections( std::vector<PolyLineCollection*>& _polylines );
......@@ -97,7 +97,7 @@ bool getTargetPolylineCollections( std::vector<PolyLineCollection*>& _polylines
* See get_object( int _identifier , BaseObject*& _object ) for more details.
*/
DLLEXPORT
OBJECTTYPEDLLEXPORT
bool getObject( int _identifier , PolyLineCollectionObject*& _object );
/** \brief Get a polyLine Collection from an object.
......@@ -106,7 +106,7 @@ bool getObject( int _identifier , PolyLineCollectionObject*& _object );
* Polyline Collection will be returned. Otherwise a NULL pointer is returned.
*/
DLLEXPORT
OBJECTTYPEDLLEXPORT
PolyLineCollection* polyLineCollection( BaseObjectData* _object );
/** \brief Cast an BaseObject to a Polyline Collection Object if possible
......@@ -115,7 +115,7 @@ PolyLineCollection* polyLineCollection( BaseObjectData* _object );
* a Polyline Collection Object is returned. Otherwise a NULL pointer is returned.
*/
DLLEXPORT
OBJECTTYPEDLLEXPORT
PolyLineCollectionObject* polyLineCollectionObject( BaseObjectData* _object );
/** \brief Get an Polyline Collection Object from the given id If possible
......@@ -124,7 +124,7 @@ PolyLineCollectionObject* polyLineCollectionObject( BaseObjectData* _object );
* a Polyline Collection Object is returned. Otherwise a NULL pointer is returned.
*/
DLLEXPORT
OBJECTTYPEDLLEXPORT
PolyLineCollectionObject* polyLineCollectionObject( int _objectId );
}
......
......@@ -69,7 +69,7 @@
#include "PolyLineCollectionNodeT.hh"
#include <OpenFlipper/common/GlobalDefines.hh>
#include <OpenFlipper/common/ObjectTypeDLLDefines.hh>
//== TYPEDEFS =================================================================
......@@ -77,7 +77,7 @@
/** This class provides the functionality for all kind of polyline collections for the framework
*/
class DLLEXPORT PolyLineCollectionObject : public BaseObjectData {
class OBJECTTYPEDLLEXPORT PolyLineCollectionObject : public BaseObjectData {
public:
typedef PolyLineCollection PolyLineCollectionType;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment