#ifndef _OGL_OGL_H_
#define _OGL_OGL_H_
-#include <wx/ogl/basic.h> // Basic shapes
-#include <wx/ogl/lines.h> // Lines and splines
-#include <wx/ogl/divided.h> // Vertically-divided rectangle
-#include <wx/ogl/composit.h> // Composite images
-#include <wx/ogl/canvas.h> // wxShapeCanvas for displaying objects
-#include <wx/ogl/ogldiag.h> // wxDiagram
+#ifdef WXMAKINGDLL_OGL
+ #define WXDLLIMPEXP_OGL WXEXPORT
+#elif defined(WXUSINGDLL)
+ #define WXDLLIMPEXP_OGL WXIMPORT
+#else // not making nor using DLL
+ #define WXDLLIMPEXP_OGL
+#endif
+
+
+#include "wx/ogl/basic.h" // Basic shapes
+#include "wx/ogl/basicp.h"
+#include "wx/ogl/lines.h" // Lines and splines
+#include "wx/ogl/linesp.h"
+#include "wx/ogl/divided.h" // Vertically-divided rectangle
+#include "wx/ogl/composit.h" // Composite images
+#include "wx/ogl/canvas.h" // wxShapeCanvas for displaying objects
+#include "wx/ogl/ogldiag.h" // wxDiagram
+
+#include "wx/ogl/bmpshape.h"
+#include "wx/ogl/constrnt.h"
+#include "wx/ogl/drawn.h"
+#include "wx/ogl/drawnp.h"
+#include "wx/ogl/mfutils.h"
+#include "wx/ogl/misc.h"
// TODO: replace with wxModule implementation
-extern void wxOGLInitialize();
-extern void wxOGLCleanUp();
+extern WXDLLIMPEXP_OGL void wxOGLInitialize();
+extern WXDLLIMPEXP_OGL void wxOGLCleanUp();
#endif
// _OGL_OGL_H_