Added dai dll import/export scheme for MSVC.

* Added SCL_DAI_EXPORT flag.
* Added SCL_DAI_DLL_EXPORTS flag.
* Added SCL_UTILS_DLL_IMPORTS flag.
This commit is contained in:
davyw authored and Mark Pictor committed 2011-12-07 18:57:50 -05:00
1 parent 457d51e303
commit c409145b25
12 files changed
+46 -20

No files matched your search

+12 -1
View File
@@ -8,6 +8,9 @@ set(LIBSTEPDAI_SRCS
sdaiEntity_extent_set.cc
sdaiModel_contents.cc
sdaiModel_contents_list.cc
sdaiEnum.cc
sdaiString.cc
sdaiBinary.cc
)
SET(LIBSTEPDAI_PRIVATE_HDRS
@@ -20,15 +23,23 @@ SET(LIBSTEPDAI_PRIVATE_HDRS
sdaiObject.h
sdaiSession_instance.h
StrUtil.hh
sdaiEnum.h
sdaiString.h
sdaiBinary.h
)
IF(MSVC)
add_definitions( -DSCL_DAI_DLL_EXPORTS )
add_definitions( -DSCL_UTILS_DLL_IMPORTS )
ENDIF(MSVC)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${SCL_SOURCE_DIR}/src/clstepcore
${SCL_SOURCE_DIR}/src/clutils
)
SCL_ADDLIB(stepdai "${LIBSTEPDAI_SRCS}" "steputils stepcore")
SCL_ADDLIB(stepdai "${LIBSTEPDAI_SRCS}" "steputils")
if(APPLE)
set_target_properties(stepdai PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
+2 -1
View File
@@ -30,6 +30,7 @@
#ifndef SDAI_APPLICATION_INSTANCE_SET_h
#define SDAI_APPLICATION_INSTANCE_SET_h
#include <scl_export.h>
//#include <STEPentity.h>
class SDAI_Application_instance__set;
@@ -38,7 +39,7 @@ typedef SDAI_Application_instance__set *
typedef SDAI_Application_instance__set_ptr
SDAI_Application_instance__set_var;
class SDAI_Application_instance__set
class SCL_DAI_EXPORT SDAI_Application_instance__set
{
public:
SDAI_Application_instance__set(int = 16);
+2 -1
View File
@@ -1,6 +1,7 @@
#ifndef SDAIBINARY_H
#define SDAIBINARY_H 1
#include <scl_export.h>
#include <string>
/*
@@ -13,7 +14,7 @@
* and is not subject to copyright.
*/
class SDAI_Binary : public std::string
class SCL_DAI_EXPORT SDAI_Binary : public std::string
{
public:
+8 -6
View File
@@ -1,6 +1,8 @@
#ifndef SDAIDAOBJECT_H
#define SDAIDAOBJECT_H 1
#include <scl_export.h>
typedef char* SDAI_DAObjectID;
// interface PID (ISO/DIS 10303-23:1996(E) 5.3.10.1)
@@ -24,7 +26,7 @@ typedef char* SDAI_DAObjectID;
SDAI_DAObjectID as follows:
*/
class SDAI_PID : public SDAI_sdaiObject
class SCL_DAI_EXPORT SDAI_PID : public SDAI_sdaiObject
{
public:
@@ -80,7 +82,7 @@ typedef SDAI_PID_ptr SDAI_PID_var;
// interface.
//
class SDAI_PID_DA: public SDAI_PID
class SCL_DAI_EXPORT SDAI_PID_DA: public SDAI_PID
{
public:
@@ -114,7 +116,7 @@ typedef SDAI_PID_DA_ptr SDAI_PID_DA_var;
// The PID_SDAI class maintains the persistent object identifier for
// a Model_contents object.
//
class SDAI_PID_SDAI : public SDAI_PID
class SCL_DAI_EXPORT SDAI_PID_SDAI : public SDAI_PID
{
public:
SDAI_String _modelid ;
@@ -152,7 +154,7 @@ class SDAI_DAObject;
typedef SDAI_DAObject* SDAI_DAObject_ptr;
typedef SDAI_DAObject_ptr SDAI_DAObject_var;
class SDAI_DAObject : public SDAI_sdaiObject
class SCL_DAI_EXPORT SDAI_DAObject : public SDAI_sdaiObject
{
public:
@@ -249,7 +251,7 @@ class SDAI_DAObject : public SDAI_sdaiObject
5.3.10.1 DAObject_SDAI
*/
class SDAI_DAObject_SDAI : public SDAI_DAObject {
class SCL_DAI_EXPORT SDAI_DAObject_SDAI : public SDAI_DAObject {
public:
SDAI_DAObject_SDAI();
@@ -472,7 +474,7 @@ class SDAI_DAObject_SDAI : public SDAI_DAObject {
typedef SDAI_DAObject_SDAI* SDAI_DAObject_SDAI_ptr;
typedef SDAI_DAObject_SDAI_ptr SDAI_DAObject_SDAI_var;
class SDAI_DAObject__set {
class SCL_DAI_EXPORT SDAI_DAObject__set {
public:
SDAI_DAObject__set(int = 16);
~SDAI_DAObject__set();
+3 -1
View File
@@ -1,6 +1,8 @@
#ifndef ENTITYEXTENT_H
#define ENTITYEXTENT_H 1
#include <scl_export.h>
/*
//#include <sdaiDefs.h>
//#include <ApplInstanceSet.h>
@@ -16,7 +18,7 @@ class SDAI_Entity_extent;
typedef SDAI_Entity_extent * SDAI_Entity_extent_ptr;
typedef SDAI_Entity_extent_ptr SDAI_Entity_extent_var;
class SDAI_Entity_extent : public SDAI_Session_instance {
class SCL_DAI_EXPORT SDAI_Entity_extent : public SDAI_Session_instance {
friend class SDAI_Model_contents;
/*
+1 -1
View File
@@ -35,7 +35,7 @@
//#include <EntityExtent.h>
*/
class SDAI_Entity_extent__set {
class SCL_DAI_EXPORT SDAI_Entity_extent__set {
public:
SDAI_Entity_extent__set(int = 16);
+4 -3
View File
@@ -12,8 +12,9 @@
* and is not subject to copyright.
*/
#include <scl_export.h>
class SDAI_Enum {
class SCL_DAI_EXPORT SDAI_Enum {
friend ostream &operator<< ( ostream&, const SDAI_Enum& );
protected:
int v; // integer value of enumeration instance
@@ -77,7 +78,7 @@ class SDAI_BOOLEAN;
enum Boolean { BFalse, BTrue, BUnset };
enum Logical { LFalse, LTrue, LUnset, LUnknown };
class SDAI_LOGICAL :
class SCL_DAI_EXPORT SDAI_LOGICAL :
public SDAI_Enum {
public:
const char * Name() const;
@@ -109,7 +110,7 @@ public SDAI_Enum {
};
class SDAI_BOOLEAN :
class SCL_DAI_EXPORT SDAI_BOOLEAN :
public SDAI_Enum {
public:
const char * Name() const;
+3 -2
View File
@@ -1,6 +1,7 @@
#ifndef SDAIMODEL_CONTENTS_H
#define SDAIMODEL_CONTENTS_H 1
#include <scl_export.h>
//SDAI_Model_contents
/*
@@ -25,7 +26,7 @@
// The class SDAI_Model_contents_instances shall implement convenience functions by
// SDAI_Model_contents in this part of ISO 10303
class SDAI_Model_contents_instances : public SDAI_DAObject
class SCL_DAI_EXPORT SDAI_Model_contents_instances : public SDAI_DAObject
{
public:
@@ -51,7 +52,7 @@ typedef SDAI_Model_contents_instances_ptr
//class SDAI_Model_contents;
//typedef SDAI_Model_contents SDAI_Model_contents_ptr;
class SDAI_Model_contents : public SDAI_Session_instance {
class SCL_DAI_EXPORT SDAI_Model_contents : public SDAI_Session_instance {
//friend class SDAI_Model;
+3 -1
View File
@@ -1,7 +1,9 @@
#ifndef SDAIMODEL_CONTENTS_LIST_H
#define SDAIMODEL_CONTENTS_LIST_H 1
class SDAI_Model_contents__list {
#include <scl_export.h>
class SCL_DAI_EXPORT SDAI_Model_contents__list {
public:
SDAI_Model_contents__list(int = 16);
~SDAI_Model_contents__list();
+3 -1
View File
@@ -2,6 +2,8 @@
#ifndef SDAIOBJECT_H
#define SDAIOBJECT_H 1
#include <scl_export.h>
/*
*/
@@ -11,7 +13,7 @@
The class Entity_instance shall be a subtype of the C++ class Object:
*/
class SDAI_sdaiObject
class SCL_DAI_EXPORT SDAI_sdaiObject
{
public:
SDAI_sdaiObject();
+2 -1
View File
@@ -2,9 +2,10 @@
#ifndef SESSION_INSTANCE_H
#define SESSION_INSTANCE_H 1
#include <scl_export.h>
//#include <sdai.h>
class SDAI_Session_instance : public SDAI_sdaiObject
class SCL_DAI_EXPORT SDAI_Session_instance : public SDAI_sdaiObject
{
public:
+3 -1
View File
@@ -11,7 +11,9 @@
* and is not subject to copyright.
*/
class SDAI_String : public std::string {
#include <scl_export.h>
class SCL_DAI_EXPORT SDAI_String : public std::string {
public:
//constructor(s) & destructor