diff --git a/include/osg/Export b/include/osg/Export index 24e5ba83e..2197472ba 100644 --- a/include/osg/Export +++ b/include/osg/Export @@ -31,7 +31,9 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # ifdef OSG_LIBRARY + # if defined( _LIB ) || defined( USE_STATIC ) + # define OSG_EXPORT + # elif defined( OSG_LIBRARY ) # define OSG_EXPORT __declspec(dllexport) # else # define OSG_EXPORT __declspec(dllimport) diff --git a/include/osgDB/Export b/include/osgDB/Export index ac0e604f5..0119f47c6 100644 --- a/include/osgDB/Export +++ b/include/osgDB/Export @@ -26,7 +26,9 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # ifdef OSGDB_LIBRARY + # if defined( _LIB ) || defined( USE_STATIC ) + # define OSGDB_EXPORT + # elif defined( OSGDB_LIBRARY ) # define OSGDB_EXPORT __declspec(dllexport) # else # define OSGDB_EXPORT __declspec(dllimport) diff --git a/include/osgFX/Export b/include/osgFX/Export index 917ef8ddf..edc499b4d 100644 --- a/include/osgFX/Export +++ b/include/osgFX/Export @@ -16,7 +16,9 @@ #define OSGFX_EXPORT_ #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # ifdef OSGFX_LIBRARY + # if defined( _LIB ) || defined( USE_STATIC ) + # define OSGFX_EXPORT + # elif defined( OSGFX_LIBRARY ) # define OSGFX_EXPORT __declspec(dllexport) # else # define OSGFX_EXPORT __declspec(dllimport) diff --git a/include/osgGA/Export b/include/osgGA/Export index fc376dfb9..425e7e45e 100644 --- a/include/osgGA/Export +++ b/include/osgGA/Export @@ -27,7 +27,9 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # ifdef OSGGA_LIBRARY + # if defined( _LIB ) || defined( USE_STATIC ) + # define OSGGA_EXPORT + # elif defined( OSGGA_LIBRARY ) # define OSGGA_EXPORT __declspec(dllexport) # else # define OSGGA_EXPORT __declspec(dllimport) diff --git a/include/osgIntrospection/Export b/include/osgIntrospection/Export index cbae94955..f81fd3a7e 100644 --- a/include/osgIntrospection/Export +++ b/include/osgIntrospection/Export @@ -25,7 +25,9 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # ifdef OSGINTROSPECTION_LIBRARY + # if defined( _LIB ) || defined( USE_STATIC ) + # define OSGINTROSPECTION_EXPORT + # elif defined( OSGINTROSPECTION_LIBRARY ) # define OSGINTROSPECTION_EXPORT __declspec(dllexport) # else # define OSGINTROSPECTION_EXPORT __declspec(dllimport) diff --git a/include/osgParticle/Export b/include/osgParticle/Export index ebf8b816b..f007c548b 100644 --- a/include/osgParticle/Export +++ b/include/osgParticle/Export @@ -27,7 +27,9 @@ #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # ifdef OSGPARTICLE_LIBRARY + # if defined( _LIB ) || defined( USE_STATIC ) + # define OSGPARTICLE_EXPORT + # elif defined( OSGPARTICLE_LIBRARY ) # define OSGPARTICLE_EXPORT __declspec(dllexport) # else # define OSGPARTICLE_EXPORT __declspec(dllimport) diff --git a/include/osgProducer/Export b/include/osgProducer/Export index a42295b83..5284dfc8a 100644 --- a/include/osgProducer/Export +++ b/include/osgProducer/Export @@ -27,7 +27,9 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # ifdef OSGPRODUCER_LIBRARY + # if defined( _LIB ) || defined( USE_STATIC ) + # define OSGPRODUCER_EXPORT + # elif defined( OSGPRODUCER_LIBRARY ) # define OSGPRODUCER_EXPORT __declspec(dllexport) # else # define OSGPRODUCER_EXPORT __declspec(dllimport) diff --git a/include/osgSim/Export b/include/osgSim/Export index 2fdbb6f35..32ebf3706 100644 --- a/include/osgSim/Export +++ b/include/osgSim/Export @@ -25,7 +25,9 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # ifdef OSGSIM_LIBRARY + # if defined( _LIB ) || defined( USE_STATIC ) + # define OSGSIM_EXPORT + # elif defined( OSGSIM_LIBRARY ) # define OSGSIM_EXPORT __declspec(dllexport) # else # define OSGSIM_EXPORT __declspec(dllimport) diff --git a/include/osgTerrain/Export b/include/osgTerrain/Export index 8fdf4f871..ad1454c54 100644 --- a/include/osgTerrain/Export +++ b/include/osgTerrain/Export @@ -26,7 +26,9 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) - # ifdef OSGTERRAIN_LIBRARY + # if defined( _LIB ) || defined( USE_STATIC ) + # define OSGTERRAIN_EXPORT + # elif defined( OSGTERRAIN_LIBRARY ) # define OSGTERRAIN_EXPORT __declspec(dllexport) # else # define OSGTERRAIN_EXPORT __declspec(dllimport) diff --git a/include/osgText/Export b/include/osgText/Export index 386a2136d..1830a4320 100644 --- a/include/osgText/Export +++ b/include/osgText/Export @@ -26,7 +26,9 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) - # ifdef OSGTEXT_LIBRARY + # if defined( _LIB ) || defined( USE_STATIC ) + # define OSGTEXT_EXPORT + # elif defined( OSGTEXT_LIBRARY ) # define OSGTEXT_EXPORT __declspec(dllexport) # else # define OSGTEXT_EXPORT __declspec(dllimport) diff --git a/include/osgUtil/Export b/include/osgUtil/Export index 8e9171058..1e4c561af 100644 --- a/include/osgUtil/Export +++ b/include/osgUtil/Export @@ -27,7 +27,9 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # ifdef OSGUTIL_LIBRARY + # if defined( _LIB ) || defined( USE_STATIC ) + # define OSGUTIL_EXPORT + # elif defined( OSGUTIL_LIBRARY ) # define OSGUTIL_EXPORT __declspec(dllexport) # else # define OSGUTIL_EXPORT __declspec(dllimport)