From e3c47b60e06840be95d71db2b9dff8b614eb35b9 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 18 May 2018 14:58:53 +0100 Subject: [PATCH] Moved REGISTER_WINDOWINGSYSTEMINTERFACE from include/osg/GraphicsContext to include/osgViewer/GraphicsWindow and added OSGVIEWER_EXPORT --- include/osg/GraphicsContext | 4 ---- include/osgViewer/GraphicsWindow | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/osg/GraphicsContext b/include/osg/GraphicsContext index 33d7b0b12..ac196d5a8 100644 --- a/include/osg/GraphicsContext +++ b/include/osg/GraphicsContext @@ -597,10 +597,6 @@ struct WindowingSystemInterfaceProxy osg::ref_ptr _wsi; }; -#define REGISTER_WINDOWINGSYSTEMINTERFACE(ext, classname) \ - extern "C" void graphicswindow_##ext(void) {} \ - static osg::WindowingSystemInterfaceProxy s_proxy_##classname(#ext); - } #endif diff --git a/include/osgViewer/GraphicsWindow b/include/osgViewer/GraphicsWindow index 9757f8f02..2ee2f24c0 100644 --- a/include/osgViewer/GraphicsWindow +++ b/include/osgViewer/GraphicsWindow @@ -273,6 +273,11 @@ class GraphicsWindowEmbedded : public GraphicsWindow virtual void raiseWindow() {} }; + +#define REGISTER_WINDOWINGSYSTEMINTERFACE(ext, classname) \ + extern "C" OSGVIEWER_EXPORT void graphicswindow_##ext(void) {} \ + static osg::WindowingSystemInterfaceProxy s_proxy_##classname(#ext); + struct GraphicsWindowFunctionProxy { GraphicsWindowFunctionProxy(CGraphicsWindowFunction function) { (function)(); }