From Christian Noon, "Got a simple patch for correcting a problem with the USE_COMPRESSOR_WRAPPER() macro in the osgDB::Registry. The problem is that the wrapper declaration doesn't match the one defined in the REGISTER_COMPRESSOR() method in the osgDB::ObjectWrapper method. This patch fixes the wrapper declaration so they both match properly. I ran into this problem using compressed files in an iOS application where all the libraries and plugins need to be built statically."

This commit is contained in:
Robert Osfield 2013-06-24 09:31:34 +00:00
parent 70ae69648d
commit 3c1a89604b

View File

@ -704,7 +704,7 @@ struct PluginFunctionProxy
static osgDB::PluginFunctionProxy proxy_serializer_library_##libname(wrapper_serializer_library_##libname); static osgDB::PluginFunctionProxy proxy_serializer_library_##libname(wrapper_serializer_library_##libname);
#define USE_COMPRESSOR_WRAPPER(classname) \ #define USE_COMPRESSOR_WRAPPER(classname) \
extern "C" void wrapper_serializer_##classname(void); \ extern "C" void wrapper_compressor_##classname(void); \
static osgDB::PluginFunctionProxy proxy_compressor_##classname(wrapper_compressor_##classname); static osgDB::PluginFunctionProxy proxy_compressor_##classname(wrapper_compressor_##classname);
#define REGISTER_OSGPLUGIN(ext, classname) \ #define REGISTER_OSGPLUGIN(ext, classname) \