From 9c93332c031a3004a1a8bf073782af76f8fe7080 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 18 Nov 2005 09:52:24 +0000 Subject: [PATCH] From Rodger James, changed the Win32 static library compilation support to use OSG_LIBRARY_STATIC to avoid problems with building libs when not required. --- include/osg/Export | 5 +++-- include/osgDB/Export | 5 +++-- include/osgFX/Export | 4 ++-- include/osgGA/Export | 4 ++-- include/osgIntrospection/Export | 4 ++-- include/osgParticle/Export | 4 ++-- include/osgProducer/Export | 4 ++-- include/osgSim/Export | 4 ++-- include/osgTerrain/Export | 4 ++-- include/osgText/Export | 4 ++-- include/osgUtil/Export | 4 ++-- 11 files changed, 24 insertions(+), 22 deletions(-) diff --git a/include/osg/Export b/include/osg/Export index e34269a66..0852e2894 100644 --- a/include/osg/Export +++ b/include/osg/Export @@ -31,13 +31,13 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # if defined( _LIB ) || defined( USE_STATIC ) + # if defined( OSG_LIBRARY_STATIC ) # define OSG_EXPORT # elif defined( OSG_LIBRARY ) # define OSG_EXPORT __declspec(dllexport) # else # define OSG_EXPORT __declspec(dllimport) - # endif /* SG_LIBRARY */ + # endif #else # define OSG_EXPORT #endif @@ -68,3 +68,4 @@ State and Drawables, and maths and general helper classes. */ #endif + diff --git a/include/osgDB/Export b/include/osgDB/Export index fc7ea59bc..af0e654a0 100644 --- a/include/osgDB/Export +++ b/include/osgDB/Export @@ -26,13 +26,13 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # if defined( _LIB ) || defined( USE_STATIC ) + # if defined( OSG_LIBRARY_STATIC ) # define OSGDB_EXPORT # elif defined( OSGDB_LIBRARY ) # define OSGDB_EXPORT __declspec(dllexport) # else # define OSGDB_EXPORT __declspec(dllimport) - # endif /* OSGDBSG_LIBRARY */ + # endif #else # define OSGDB_EXPORT #endif @@ -46,3 +46,4 @@ The plugin framework in centred around the osgDB::Registry, and allows plugins w */ #endif + diff --git a/include/osgFX/Export b/include/osgFX/Export index edc499b4d..b69b70580 100644 --- a/include/osgFX/Export +++ b/include/osgFX/Export @@ -16,13 +16,13 @@ #define OSGFX_EXPORT_ #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # if defined( _LIB ) || defined( USE_STATIC ) + # if defined( OSG_LIBRARY_STATIC ) # define OSGFX_EXPORT # elif defined( OSGFX_LIBRARY ) # define OSGFX_EXPORT __declspec(dllexport) # else # define OSGFX_EXPORT __declspec(dllimport) - # endif /* OSGFX_LIBRARY */ + # endif #else # define OSGFX_EXPORT #endif diff --git a/include/osgGA/Export b/include/osgGA/Export index 425e7e45e..8124efcb6 100644 --- a/include/osgGA/Export +++ b/include/osgGA/Export @@ -27,13 +27,13 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # if defined( _LIB ) || defined( USE_STATIC ) + # if defined( OSG_LIBRARY_STATIC ) # define OSGGA_EXPORT # elif defined( OSGGA_LIBRARY ) # define OSGGA_EXPORT __declspec(dllexport) # else # define OSGGA_EXPORT __declspec(dllimport) - #endif /* OSGUTIL_LIBRARY */ + #endif #else #define OSGGA_EXPORT #endif diff --git a/include/osgIntrospection/Export b/include/osgIntrospection/Export index f81fd3a7e..3c45408dd 100644 --- a/include/osgIntrospection/Export +++ b/include/osgIntrospection/Export @@ -25,13 +25,13 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # if defined( _LIB ) || defined( USE_STATIC ) + # if defined( OSG_LIBRARY_STATIC ) # define OSGINTROSPECTION_EXPORT # elif defined( OSGINTROSPECTION_LIBRARY ) # define OSGINTROSPECTION_EXPORT __declspec(dllexport) # else # define OSGINTROSPECTION_EXPORT __declspec(dllimport) - # endif /* OSGINTROSPECTION_LIBRARY */ + # endif #else # define OSGINTROSPECTION_EXPORT #endif diff --git a/include/osgParticle/Export b/include/osgParticle/Export index f007c548b..3a6465815 100644 --- a/include/osgParticle/Export +++ b/include/osgParticle/Export @@ -27,13 +27,13 @@ #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # if defined( _LIB ) || defined( USE_STATIC ) + # if defined( OSG_LIBRARY_STATIC ) # define OSGPARTICLE_EXPORT # elif defined( OSGPARTICLE_LIBRARY ) # define OSGPARTICLE_EXPORT __declspec(dllexport) # else # define OSGPARTICLE_EXPORT __declspec(dllimport) - # endif /* OSGPARTICLE_LIBRARY */ + # endif #else # define OSGPARTICLE_EXPORT #endif diff --git a/include/osgProducer/Export b/include/osgProducer/Export index 0cf7d41fc..585099011 100644 --- a/include/osgProducer/Export +++ b/include/osgProducer/Export @@ -27,13 +27,13 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # if defined( _LIB ) || defined( USE_STATIC ) + # if defined( OSG_LIBRARY_STATIC ) # define OSGPRODUCER_EXPORT # elif defined( OSGPRODUCER_LIBRARY ) # define OSGPRODUCER_EXPORT __declspec(dllexport) # else # define OSGPRODUCER_EXPORT __declspec(dllimport) - #endif /* OSGPRODUCER_LIBRARY */ + #endif #else #define OSGPRODUCER_EXPORT #endif diff --git a/include/osgSim/Export b/include/osgSim/Export index 32ebf3706..5e808fc33 100644 --- a/include/osgSim/Export +++ b/include/osgSim/Export @@ -25,13 +25,13 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # if defined( _LIB ) || defined( USE_STATIC ) + # if defined( OSG_LIBRARY_STATIC ) # define OSGSIM_EXPORT # elif defined( OSGSIM_LIBRARY ) # define OSGSIM_EXPORT __declspec(dllexport) # else # define OSGSIM_EXPORT __declspec(dllimport) - # endif /* SG_LIBRARY */ + # endif #else # define OSGSIM_EXPORT #endif diff --git a/include/osgTerrain/Export b/include/osgTerrain/Export index ad1454c54..e217ae09c 100644 --- a/include/osgTerrain/Export +++ b/include/osgTerrain/Export @@ -26,13 +26,13 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) - # if defined( _LIB ) || defined( USE_STATIC ) + # if defined( OSG_LIBRARY_STATIC ) # define OSGTERRAIN_EXPORT # elif defined( OSGTERRAIN_LIBRARY ) # define OSGTERRAIN_EXPORT __declspec(dllexport) # else # define OSGTERRAIN_EXPORT __declspec(dllimport) - # endif /* OSGTERRAIN_LIBRARY */ + # endif #else # define OSGTERRAIN_EXPORT #endif diff --git a/include/osgText/Export b/include/osgText/Export index 1830a4320..193d7b155 100644 --- a/include/osgText/Export +++ b/include/osgText/Export @@ -26,13 +26,13 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) - # if defined( _LIB ) || defined( USE_STATIC ) + # if defined( OSG_LIBRARY_STATIC ) # define OSGTEXT_EXPORT # elif defined( OSGTEXT_LIBRARY ) # define OSGTEXT_EXPORT __declspec(dllexport) # else # define OSGTEXT_EXPORT __declspec(dllimport) - # endif /* OSGTEXT_LIBRARY */ + # endif #else # define OSGTEXT_EXPORT #endif diff --git a/include/osgUtil/Export b/include/osgUtil/Export index 1e4c561af..055fe3730 100644 --- a/include/osgUtil/Export +++ b/include/osgUtil/Export @@ -27,13 +27,13 @@ #endif #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # if defined( _LIB ) || defined( USE_STATIC ) + # if defined( OSG_LIBRARY_STATIC ) # define OSGUTIL_EXPORT # elif defined( OSGUTIL_LIBRARY ) # define OSGUTIL_EXPORT __declspec(dllexport) # else # define OSGUTIL_EXPORT __declspec(dllimport) - #endif /* OSGUTIL_LIBRARY */ + #endif #else #define OSGUTIL_EXPORT #endif