Commit 6ee8c967 authored by Jan Möbius's avatar Jan Möbius

ObjectType windows libraries need proper dllexports

parent a4aa87c4
......@@ -24,6 +24,7 @@ link_directories (
if (WIN32)
add_definitions (
-DPLUGINLIBDLL
-DBUILDOBJECTTYPEDLL
-DACGDLL
-DUSEACG
)
......
......@@ -62,7 +62,7 @@
#include <ACG/Scenegraph/BaseNode.hh>
#include <ACG/Scenegraph/DrawModes.hh>
#include <ACG/Math/Matrix4x4T.hh>
#include <OpenFlipper/common/GlobalDefines.hh>
#include <OpenFlipper/common/ObjectTypeDLLDefines.hh>
#include <ACG/GL/VertexDeclaration.hh>
#include <ACG/GL/IRenderer.hh>
#include <ACG/GL/GLPrimitives.hh>
......@@ -71,7 +71,7 @@
//== CLASS DEFINITION =========================================================
class DLLEXPORT PlaneNode : public ACG::SceneGraph::BaseNode
class OBJECTTYPEDLLEXPORT PlaneNode : public ACG::SceneGraph::BaseNode
{
public:
/** \brief Construct a plane rendering node
......
......@@ -68,7 +68,7 @@
#include <OpenFlipper/common/BaseObjectData.hh>
#include <OpenFlipper/common/GlobalDefines.hh>
#include <OpenFlipper/common/ObjectTypeDLLDefines.hh>
#include "PlaneTypes.hh"
......@@ -76,7 +76,7 @@
// //== CLASS DEFINITION =========================================================
class DLLEXPORT PlaneObject : public BaseObjectData {
class OBJECTTYPEDLLEXPORT PlaneObject : public BaseObjectData {
friend class TypePlanePlugin;
......
......@@ -61,7 +61,7 @@
#include <ACG/Math/Matrix4x4T.hh>
#include <ACG/Math/VectorT.hh>
#include <OpenFlipper/common/GlobalDefines.hh>
#include <OpenFlipper/common/ObjectTypeDLLDefines.hh>
//== NAMESPACES ===============================================================
......@@ -74,7 +74,7 @@
**/
class DLLEXPORT Plane {
class OBJECTTYPEDLLEXPORT Plane {
public:
......
......@@ -64,6 +64,7 @@
#define PLUGINFUNCTIONSPLANE_HH
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/common/ObjectTypeDLLDefines.hh>
/** The Namespace PluginFunctions contains functions for all plugins. */
namespace PluginFunctions {
......@@ -71,7 +72,7 @@ namespace PluginFunctions {
/** This functions returns the object with the given id if it is a PlaneObject.
* See get_object( int _identifier , BaseObject*& _object ) for more details.
*/
DLLEXPORT
OBJECTTYPEDLLEXPORT
bool getObject( int _identifier , PlaneObject*& _object );
/** \brief Get a PlaneNode from an object.
......@@ -79,7 +80,7 @@ bool getObject( int _identifier , PlaneObject*& _object );
* @param _object The object should be of type BaseDataObject. If the content is a plane, a
* PlaneNode will be returned. Otherwise a NULL pointer is returned.
*/
DLLEXPORT
OBJECTTYPEDLLEXPORT
PlaneNode* planeNode( BaseObjectData* _object );
/** \brief Get a Plane from an object.
......@@ -87,7 +88,7 @@ PlaneNode* planeNode( BaseObjectData* _object );
* @param _object The object should be of type BaseDataObject. If the content is a plane, a
* Plane will be returned. Otherwise a NULL pointer is returned.
*/
DLLEXPORT
OBJECTTYPEDLLEXPORT
Plane* plane( BaseObjectData* _object );
/** \brief Cast an BaseObject to a PlaneObject if possible
......@@ -95,14 +96,14 @@ Plane* plane( BaseObjectData* _object );
* @param _object The object should be of type BaseDataObject. If the content is a plane, a
* a PlaneObject is returned. Otherwise a NULL pointer is returned.
*/
DLLEXPORT
OBJECTTYPEDLLEXPORT
PlaneObject* planeObject( BaseObjectData* _object );
/** \brief Get a PlaneObject from an object id if possible
*
* @param _objectId If the object is a plane, a PlaneObject is returned. Otherwise a NULL pointer is returned.
*/
DLLEXPORT
OBJECTTYPEDLLEXPORT
PlaneObject* planeObject( int _objectId );
}
......
......@@ -53,7 +53,7 @@
#include <ACG/GL/GLState.hh>
#include <ACG/Math/VectorT.hh>
#include <OpenFlipper/common/GlobalDefines.hh>
#include <OpenFlipper/common/ObjectTypeDLLDefines.hh>
#include <ACG/Scenegraph/TransformNode.hh>
#include <ACG/Scenegraph/LineNode.hh>
......@@ -64,7 +64,7 @@
#include <list>
class DLLEXPORT QtPlaneSelect : public QObject
class OBJECTTYPEDLLEXPORT QtPlaneSelect : public QObject
{
Q_OBJECT
......
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