Commit 5834e277 authored by Mike Kremer's avatar Mike Kremer
Browse files

- add dll export macros

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@699 fdac6126-5c0c-442c-9429-916003d36597
parent dcf5272a
...@@ -71,7 +71,7 @@ namespace VDPM { ...@@ -71,7 +71,7 @@ namespace VDPM {
*/ */
class Plane3d class OPENMESHDLLEXPORT Plane3d
{ {
public: public:
......
...@@ -102,7 +102,7 @@ class OPENMESHDLLEXPORT _IOManager_ ...@@ -102,7 +102,7 @@ class OPENMESHDLLEXPORT _IOManager_
private: private:
_IOManager_() {} _IOManager_() {}
friend _IOManager_& IOManager(); friend OPENMESHDLLEXPORT _IOManager_& IOManager();
public: public:
...@@ -247,7 +247,7 @@ private: ...@@ -247,7 +247,7 @@ private:
extern _IOManager_* __IOManager_instance; extern _IOManager_* __IOManager_instance;
_IOManager_& IOManager(); OPENMESHDLLEXPORT _IOManager_& IOManager();
......
...@@ -71,7 +71,7 @@ namespace IO { ...@@ -71,7 +71,7 @@ namespace IO {
#ifndef DOXY_IGNORE_THIS #ifndef DOXY_IGNORE_THIS
struct OFFFormat struct OPENMESHDLLEXPORT OFFFormat
{ {
typedef int integer_type; typedef int integer_type;
typedef float float_type; typedef float float_type;
......
...@@ -79,7 +79,7 @@ namespace IO { ...@@ -79,7 +79,7 @@ namespace IO {
the target data structure. the target data structure.
*/ */
class BaseExporter class OPENMESHDLLEXPORT BaseExporter
{ {
public: public:
......
...@@ -78,7 +78,7 @@ namespace IO { ...@@ -78,7 +78,7 @@ namespace IO {
* structure. This is basically a wrapper providing virtual versions * structure. This is basically a wrapper providing virtual versions
* for the required mesh functions. * for the required mesh functions.
*/ */
class BaseImporter class OPENMESHDLLEXPORT BaseImporter
{ {
public: public:
......
...@@ -176,7 +176,7 @@ private: ...@@ -176,7 +176,7 @@ private:
extern _OBJReader_ __OBJReaderInstance; extern _OBJReader_ __OBJReaderInstance;
_OBJReader_& OBJReader(); OPENMESHDLLEXPORT _OBJReader_& OBJReader();
//============================================================================= //=============================================================================
......
...@@ -157,7 +157,7 @@ private: ...@@ -157,7 +157,7 @@ private:
/// Declare the single entity of the OFF reader /// Declare the single entity of the OFF reader
extern _OFFReader_ __OFFReaderInstance; extern _OFFReader_ __OFFReaderInstance;
_OFFReader_& OFFReader(); OPENMESHDLLEXPORT _OFFReader_& OFFReader();
//============================================================================= //=============================================================================
......
...@@ -159,7 +159,7 @@ private: ...@@ -159,7 +159,7 @@ private:
/// Declare the single entity of the OM reader. /// Declare the single entity of the OM reader.
extern _OMReader_ __OMReaderInstance; extern _OMReader_ __OMReaderInstance;
_OMReader_& OMReader(); OPENMESHDLLEXPORT _OMReader_& OMReader();
//============================================================================= //=============================================================================
......
...@@ -183,7 +183,7 @@ private: ...@@ -183,7 +183,7 @@ private:
/// Declare the single entity of the PLY reader /// Declare the single entity of the PLY reader
extern _PLYReader_ __PLYReaderInstance; extern _PLYReader_ __PLYReaderInstance;
_PLYReader_& PLYReader(); OPENMESHDLLEXPORT _PLYReader_& PLYReader();
//============================================================================= //=============================================================================
......
...@@ -135,7 +135,7 @@ private: ...@@ -135,7 +135,7 @@ private:
/// Declare the single entity of the STL reader /// Declare the single entity of the STL reader
extern _STLReader_ __STLReaderInstance; extern _STLReader_ __STLReaderInstance;
_STLReader_& STLReader(); OPENMESHDLLEXPORT _STLReader_& STLReader();
//============================================================================= //=============================================================================
......
...@@ -118,7 +118,7 @@ private: ...@@ -118,7 +118,7 @@ private:
/// Declare the single entity of the OBJ writer /// Declare the single entity of the OBJ writer
extern _OBJWriter_ __OBJWriterinstance; extern _OBJWriter_ __OBJWriterinstance;
_OBJWriter_& OBJWriter(); OPENMESHDLLEXPORT _OBJWriter_& OBJWriter();
//============================================================================= //=============================================================================
......
...@@ -122,7 +122,7 @@ protected: ...@@ -122,7 +122,7 @@ protected:
/// Declare the single entity of the OFF writer. /// Declare the single entity of the OFF writer.
extern _OFFWriter_ __OFFWriterInstance; extern _OFFWriter_ __OFFWriterInstance;
_OFFWriter_& OFFWriter(); OPENMESHDLLEXPORT _OFFWriter_& OFFWriter();
//============================================================================= //=============================================================================
......
...@@ -129,7 +129,7 @@ protected: ...@@ -129,7 +129,7 @@ protected:
/// Declare the single entity of the OM writer. /// Declare the single entity of the OM writer.
extern _OMWriter_ __OMWriterInstance; extern _OMWriter_ __OMWriterInstance;
_OMWriter_& OMWriter(); OPENMESHDLLEXPORT _OMWriter_& OMWriter();
//============================================================================= //=============================================================================
......
...@@ -126,7 +126,7 @@ protected: ...@@ -126,7 +126,7 @@ protected:
/// Declare the single entity of the PLY writer. /// Declare the single entity of the PLY writer.
extern _PLYWriter_ __PLYWriterInstance; extern _PLYWriter_ __PLYWriterInstance;
_PLYWriter_& PLYWriter(); OPENMESHDLLEXPORT _PLYWriter_& PLYWriter();
//============================================================================= //=============================================================================
......
...@@ -110,7 +110,7 @@ private: ...@@ -110,7 +110,7 @@ private:
// Declare the single entity of STL writer. // Declare the single entity of STL writer.
extern _STLWriter_ __STLWriterInstance; extern _STLWriter_ __STLWriterInstance;
_STLWriter_& STLWriter(); OPENMESHDLLEXPORT _STLWriter_& STLWriter();
//============================================================================= //=============================================================================
......
...@@ -82,7 +82,7 @@ namespace OpenMesh { ...@@ -82,7 +82,7 @@ namespace OpenMesh {
\see OpenMesh::Concepts::KernelT, \ref mesh_type \see OpenMesh::Concepts::KernelT, \ref mesh_type
*/ */
class ArrayKernel : public BaseKernel, public ArrayItems class OPENMESHDLLEXPORT ArrayKernel : public BaseKernel, public ArrayItems
{ {
public: public:
......
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
\see OpenMesh::mostream \see OpenMesh::mostream
*/ */
//@{ //@{
OpenMesh::mostream& omlog(); OPENMESHDLLEXPORT OpenMesh::mostream& omlog();
OpenMesh::mostream& omout(); OPENMESHDLLEXPORT OpenMesh::mostream& omout();
OpenMesh::mostream& omerr(); OPENMESHDLLEXPORT OpenMesh::mostream& omerr();
//@} //@}
//============================================================================= //=============================================================================
......
...@@ -40,11 +40,11 @@ static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95"; ...@@ -40,11 +40,11 @@ static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95";
#include <string.h> #include <string.h>
#include "getopt.h" #include "getopt.h"
int opterr = 1, /* if error message should be printed */ OPENMESHDLLEXPORT int opterr = 1, /* if error message should be printed */
optind = 1, /* index into parent argv vector */ optind = 1, /* index into parent argv vector */
optopt, /* character checked for validity */ optopt, /* character checked for validity */
optreset; /* reset getopt */ optreset; /* reset getopt */
char *optarg; /* argument associated with option */ OPENMESHDLLEXPORT char *optarg; /* argument associated with option */
#define BADCH (int)'?' #define BADCH (int)'?'
#define BADARG (int)':' #define BADARG (int)':'
...@@ -54,7 +54,7 @@ char *optarg; /* argument associated with option */ ...@@ -54,7 +54,7 @@ char *optarg; /* argument associated with option */
* getopt -- * getopt --
* Parse argc/argv argument vector. * Parse argc/argv argument vector.
*/ */
int OPENMESHDLLEXPORT int
getopt(int nargc, char * const *nargv, const char *ostr) getopt(int nargc, char * const *nargv, const char *ostr)
{ {
# define __progname nargv[0] # define __progname nargv[0]
......
...@@ -2,19 +2,20 @@ ...@@ -2,19 +2,20 @@
#define _GETOPT_H_ #define _GETOPT_H_
#include <OpenMesh/Core/System/compiler.hh> #include <OpenMesh/Core/System/compiler.hh>
#include <OpenMesh/Core/System/OpenMeshDLLMacros.hh>
#if defined(WIN32) #if defined(WIN32)
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
extern int opterr; extern OPENMESHDLLEXPORT int opterr;
extern int optind; extern OPENMESHDLLEXPORT int optind;
extern int optopt; extern OPENMESHDLLEXPORT int optopt;
extern int optreset; extern OPENMESHDLLEXPORT int optreset;
extern char *optarg; extern OPENMESHDLLEXPORT char *optarg;
extern int getopt(int nargc, char * const *nargv, const char *ostr); OPENMESHDLLEXPORT extern int getopt(int nargc, char * const *nargv, const char *ostr);
} }
......
...@@ -73,7 +73,7 @@ namespace VDPM { ...@@ -73,7 +73,7 @@ namespace VDPM {
Mesh traits for View Dependent Progressive Meshes Mesh traits for View Dependent Progressive Meshes
*/ */
struct MeshTraits : public DefaultTraits struct OPENMESHDLLEXPORT MeshTraits : public DefaultTraits
{ {
VertexTraits VertexTraits
{ {
......
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