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

OSG_LIBRARY_STATIC to avoid problems with building libs when not required.
2005-11-18 09:52:24 +00:00 · 2005-11-18 09:52:24 +00:00 · 9c93332c03
commit 9c93332c03
parent 91855e7c50
11 changed files with 24 additions and 22 deletions
--- 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
+
--- 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
+
--- 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
--- 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 
--- 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  
--- 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
--- 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 
--- 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  
--- 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  
--- 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  
--- 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