From d2aefbc09a299394f62f856aaeee0830d643f3ac Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 21 May 2007 07:54:01 +0000 Subject: [PATCH] Added static build support to export macros --- include/osgManipulator/Export | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/osgManipulator/Export b/include/osgManipulator/Export index 1ffee7632..65bd7c2b9 100644 --- a/include/osgManipulator/Export +++ b/include/osgManipulator/Export @@ -15,12 +15,14 @@ #ifndef OSGMANIPULATOR_EXPORT_ #define OSGMANIPULATOR_EXPORT_ 1 -#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) - # ifdef OSGMANIPULATOR_LIBRARY +#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) + # if defined( OSG_LIBRARY_STATIC ) + # define OSGMANIPULATOR_EXPORT + # elif defined( OSGMANIPULATOR_LIBRARY ) # define OSGMANIPULATOR_EXPORT __declspec(dllexport) # else # define OSGMANIPULATOR_EXPORT __declspec(dllimport) - # endif /* OSGMANIPULATOR_LIBRARY */ + # endif #else # define OSGMANIPULATOR_EXPORT #endif