From 02defea1b0d8f3a12d054f9ab85b865b3653035e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 24 Jun 2009 17:37:59 +0000 Subject: [PATCH] Added use of REGISTER_OGRPLUGIN to enable static linking of plugins --- src/osgPlugins/gdal/ReaderWriterGDAL.cpp | 2 +- src/osgPlugins/imageio/ReaderWriterImageIO.cpp | 3 +-- src/osgPlugins/ogr/ReaderWriterOGR.cpp | 2 +- src/osgPlugins/vnc/ReaderWriterVNC.cpp | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/osgPlugins/gdal/ReaderWriterGDAL.cpp b/src/osgPlugins/gdal/ReaderWriterGDAL.cpp index ea1f99b2f..0219f7ae9 100644 --- a/src/osgPlugins/gdal/ReaderWriterGDAL.cpp +++ b/src/osgPlugins/gdal/ReaderWriterGDAL.cpp @@ -804,4 +804,4 @@ class ReaderWriterGDAL : public osgDB::ReaderWriter // now register with Registry to instantiate the above // reader/writer. -osgDB::RegisterReaderWriterProxy g_readerWriter_GDAL_Proxy; +REGISTER_OSGPLUGIN(gdal, ReaderWriterGDAL) diff --git a/src/osgPlugins/imageio/ReaderWriterImageIO.cpp b/src/osgPlugins/imageio/ReaderWriterImageIO.cpp index 8fd6545bc..d91994458 100644 --- a/src/osgPlugins/imageio/ReaderWriterImageIO.cpp +++ b/src/osgPlugins/imageio/ReaderWriterImageIO.cpp @@ -1248,8 +1248,7 @@ public: // now register with Registry to instantiate the above // reader/writer. - -osgDB::RegisterReaderWriterProxy g_readerWriter_ImageIO_Proxy; +REGISTER_OSGPLUGIN(imagio, ReaderWriterImageIO) diff --git a/src/osgPlugins/ogr/ReaderWriterOGR.cpp b/src/osgPlugins/ogr/ReaderWriterOGR.cpp index f3d25c589..58226f20f 100644 --- a/src/osgPlugins/ogr/ReaderWriterOGR.cpp +++ b/src/osgPlugins/ogr/ReaderWriterOGR.cpp @@ -446,4 +446,4 @@ public: // now register with Registry to instantiate the above // reader/writer. -osgDB::RegisterReaderWriterProxy g_readerWriter_OGR_Proxy; +REGISTER_OSGPLUGIN(ogr, ReaderWriterOGR) diff --git a/src/osgPlugins/vnc/ReaderWriterVNC.cpp b/src/osgPlugins/vnc/ReaderWriterVNC.cpp index 962058036..3d35361c6 100644 --- a/src/osgPlugins/vnc/ReaderWriterVNC.cpp +++ b/src/osgPlugins/vnc/ReaderWriterVNC.cpp @@ -372,5 +372,5 @@ class ReaderWriterVNC : public osgDB::ReaderWriter // now register with Registry to instantiate the above // reader/writer. -osgDB::RegisterReaderWriterProxy g_readerWriter_VNC_Proxy; +REGISTER_OSGPLUGIN(vnc, ReaderWriterVNC)