FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Rodger James, changed the Win32 static library compilation support to use

Browse Source 
OSG_LIBRARY_STATIC to avoid problems with building libs when not required.
This commit is contained in:
Robert Osfield 2005-11-18 09:52:24 +00:00
parent 91855e7c50
commit 9c93332c03
11 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/osg/Export
View File

@ -31,13 +31,13 @@
#endif #endif
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) #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 # define OSG_EXPORT
# elif defined( OSG_LIBRARY ) # elif defined( OSG_LIBRARY )
# define OSG_EXPORT __declspec(dllexport) # define OSG_EXPORT __declspec(dllexport)
# else # else
# define OSG_EXPORT __declspec(dllimport) # define OSG_EXPORT __declspec(dllimport)
# endif /* SG_LIBRARY */ # endif
#else #else
# define OSG_EXPORT # define OSG_EXPORT
#endif #endif
@ -68,3 +68,4 @@ State and Drawables, and maths and general helper classes.
*/ */
#endif #endif

5
include/osgDB/Export
View File

@ -26,13 +26,13 @@
#endif #endif
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) #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 # define OSGDB_EXPORT
# elif defined( OSGDB_LIBRARY ) # elif defined( OSGDB_LIBRARY )
# define OSGDB_EXPORT __declspec(dllexport) # define OSGDB_EXPORT __declspec(dllexport)
# else # else
# define OSGDB_EXPORT __declspec(dllimport) # define OSGDB_EXPORT __declspec(dllimport)
# endif /* OSGDBSG_LIBRARY */ # endif
#else #else
# define OSGDB_EXPORT # define OSGDB_EXPORT
#endif #endif
@ -46,3 +46,4 @@ The plugin framework in centred around the osgDB::Registry, and allows plugins w
*/ */
#endif #endif

4
include/osgFX/Export
View File

@ -16,13 +16,13 @@
#define OSGFX_EXPORT_ #define OSGFX_EXPORT_
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) #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 # define OSGFX_EXPORT
# elif defined( OSGFX_LIBRARY ) # elif defined( OSGFX_LIBRARY )
# define OSGFX_EXPORT __declspec(dllexport) # define OSGFX_EXPORT __declspec(dllexport)
# else # else
# define OSGFX_EXPORT __declspec(dllimport) # define OSGFX_EXPORT __declspec(dllimport)
# endif /* OSGFX_LIBRARY */ # endif
#else #else
# define OSGFX_EXPORT # define OSGFX_EXPORT
#endif #endif

4
include/osgGA/Export
View File

@ -27,13 +27,13 @@
#endif #endif
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) #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 # define OSGGA_EXPORT
# elif defined( OSGGA_LIBRARY ) # elif defined( OSGGA_LIBRARY )
# define OSGGA_EXPORT __declspec(dllexport) # define OSGGA_EXPORT __declspec(dllexport)
# else # else
# define OSGGA_EXPORT __declspec(dllimport) # define OSGGA_EXPORT __declspec(dllimport)
#endif /* OSGUTIL_LIBRARY */ #endif
#else #else
#define OSGGA_EXPORT #define OSGGA_EXPORT
#endif #endif

4
include/osgIntrospection/Export
View File

@ -25,13 +25,13 @@
#endif #endif
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) #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 # define OSGINTROSPECTION_EXPORT
# elif defined( OSGINTROSPECTION_LIBRARY ) # elif defined( OSGINTROSPECTION_LIBRARY )
# define OSGINTROSPECTION_EXPORT __declspec(dllexport) # define OSGINTROSPECTION_EXPORT __declspec(dllexport)
# else # else
# define OSGINTROSPECTION_EXPORT __declspec(dllimport) # define OSGINTROSPECTION_EXPORT __declspec(dllimport)
# endif /* OSGINTROSPECTION_LIBRARY */ # endif
#else #else
# define OSGINTROSPECTION_EXPORT # define OSGINTROSPECTION_EXPORT
#endif #endif

4
include/osgParticle/Export
View File

@ -27,13 +27,13 @@
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) #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 # define OSGPARTICLE_EXPORT
# elif defined( OSGPARTICLE_LIBRARY ) # elif defined( OSGPARTICLE_LIBRARY )
# define OSGPARTICLE_EXPORT __declspec(dllexport) # define OSGPARTICLE_EXPORT __declspec(dllexport)
# else # else
# define OSGPARTICLE_EXPORT __declspec(dllimport) # define OSGPARTICLE_EXPORT __declspec(dllimport)
# endif /* OSGPARTICLE_LIBRARY */ # endif
#else #else
# define OSGPARTICLE_EXPORT # define OSGPARTICLE_EXPORT
#endif #endif

4
include/osgProducer/Export
View File

@ -27,13 +27,13 @@
#endif #endif
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) #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 # define OSGPRODUCER_EXPORT
# elif defined( OSGPRODUCER_LIBRARY ) # elif defined( OSGPRODUCER_LIBRARY )
# define OSGPRODUCER_EXPORT __declspec(dllexport) # define OSGPRODUCER_EXPORT __declspec(dllexport)
# else # else
# define OSGPRODUCER_EXPORT __declspec(dllimport) # define OSGPRODUCER_EXPORT __declspec(dllimport)
#endif /* OSGPRODUCER_LIBRARY */ #endif
#else #else
#define OSGPRODUCER_EXPORT #define OSGPRODUCER_EXPORT
#endif #endif

4
include/osgSim/Export
View File

@ -25,13 +25,13 @@
#endif #endif
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) #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 # define OSGSIM_EXPORT
# elif defined( OSGSIM_LIBRARY ) # elif defined( OSGSIM_LIBRARY )
# define OSGSIM_EXPORT __declspec(dllexport) # define OSGSIM_EXPORT __declspec(dllexport)
# else # else
# define OSGSIM_EXPORT __declspec(dllimport) # define OSGSIM_EXPORT __declspec(dllimport)
# endif /* SG_LIBRARY */ # endif
#else #else
# define OSGSIM_EXPORT # define OSGSIM_EXPORT
#endif #endif

4
include/osgTerrain/Export
View File

@ -26,13 +26,13 @@
#endif #endif
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__)
# if defined( _LIB ) || defined( USE_STATIC ) # if defined( OSG_LIBRARY_STATIC )
# define OSGTERRAIN_EXPORT # define OSGTERRAIN_EXPORT
# elif defined( OSGTERRAIN_LIBRARY ) # elif defined( OSGTERRAIN_LIBRARY )
# define OSGTERRAIN_EXPORT __declspec(dllexport) # define OSGTERRAIN_EXPORT __declspec(dllexport)
# else # else
# define OSGTERRAIN_EXPORT __declspec(dllimport) # define OSGTERRAIN_EXPORT __declspec(dllimport)
# endif /* OSGTERRAIN_LIBRARY */ # endif
#else #else
# define OSGTERRAIN_EXPORT # define OSGTERRAIN_EXPORT
#endif #endif

4
include/osgText/Export
View File

@ -26,13 +26,13 @@
#endif #endif
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__)
# if defined( _LIB ) || defined( USE_STATIC ) # if defined( OSG_LIBRARY_STATIC )
# define OSGTEXT_EXPORT # define OSGTEXT_EXPORT
# elif defined( OSGTEXT_LIBRARY ) # elif defined( OSGTEXT_LIBRARY )
# define OSGTEXT_EXPORT __declspec(dllexport) # define OSGTEXT_EXPORT __declspec(dllexport)
# else # else
# define OSGTEXT_EXPORT __declspec(dllimport) # define OSGTEXT_EXPORT __declspec(dllimport)
# endif /* OSGTEXT_LIBRARY */ # endif
#else #else
# define OSGTEXT_EXPORT # define OSGTEXT_EXPORT
#endif #endif

4
include/osgUtil/Export
View File

@ -27,13 +27,13 @@
#endif #endif
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__) #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 # define OSGUTIL_EXPORT
# elif defined( OSGUTIL_LIBRARY ) # elif defined( OSGUTIL_LIBRARY )
# define OSGUTIL_EXPORT __declspec(dllexport) # define OSGUTIL_EXPORT __declspec(dllexport)
# else # else
# define OSGUTIL_EXPORT __declspec(dllimport) # define OSGUTIL_EXPORT __declspec(dllimport)
#endif /* OSGUTIL_LIBRARY */ #endif
#else #else
#define OSGUTIL_EXPORT #define OSGUTIL_EXPORT
#endif #endif