Fixed|Windows: Missing exports and OpenGLGL API callback

skyjake · Feb 26, 2014 · 1158298 · 1158298
1 parent 0acbb96
commit 1158298
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/doomsday/libappfw/include/de/framework/basewindow.h b/doomsday/libappfw/include/de/framework/basewindow.h
@@ -37,7 +37,7 @@ class WindowTransform;
  * will override the built-in transformation. The built-in transformation specifies an
  * "identity" transformation that doesn't differ from the logical layout.
  */
-class BaseWindow : public PersistentCanvasWindow
+class LIBAPPFW_PUBLIC BaseWindow : public PersistentCanvasWindow
 {
 public:
     BaseWindow(String const &id);

diff --git a/doomsday/libappfw/include/de/framework/vrwindowtransform.h b/doomsday/libappfw/include/de/framework/vrwindowtransform.h
@@ -20,14 +20,15 @@
 #ifndef LIBAPPFW_VRWINDOWTRANSFORM_H
 #define LIBAPPFW_VRWINDOWTRANSFORM_H
 
+#include "../libappfw.h"
 #include "../WindowTransform"
 
 namespace de {
 
 /**
  * Window content transformation for virtual reality.
  */
-class VRWindowTransform : public WindowTransform
+class LIBAPPFW_PUBLIC VRWindowTransform : public WindowTransform
 {
 public:
     VRWindowTransform(BaseWindow &window);

diff --git a/doomsday/libappfw/include/de/framework/windowsystem.h b/doomsday/libappfw/include/de/framework/windowsystem.h
@@ -41,7 +41,7 @@ namespace de {
  *
  * @ingroup gui
  */
-class WindowSystem : public System
+class LIBAPPFW_PUBLIC WindowSystem : public System
 {
 public:
     /// Required/referenced Window instance is missing. @ingroup errors

diff --git a/doomsday/libappfw/include/de/widgets/tabwidget.h b/doomsday/libappfw/include/de/widgets/tabwidget.h
@@ -32,7 +32,7 @@ namespace de {
  * The widget sets its own height based on the height of the tab buttons. Tab buttons
  * are centered in the width of the widget.
  */
-class TabWidget : public GuiWidget
+class LIBAPPFW_PUBLIC TabWidget : public GuiWidget
 {
     Q_OBJECT
 

diff --git a/doomsday/libdeng2/include/de/data/bitfield.h b/doomsday/libdeng2/include/de/data/bitfield.h
@@ -48,7 +48,7 @@ class DENG2_PUBLIC BitField
     /**
      * Metadata about the elements of a bit field.
      */
-    class Elements
+    class DENG2_PUBLIC Elements
     {
     public:
         Elements();

diff --git a/doomsday/libgui/src/glinfo.cpp b/doomsday/libgui/src/glinfo.cpp
@@ -30,9 +30,15 @@ namespace de {
 
 static GLInfo info;
 
+#ifdef WIN32
+#  define GL_CALL APIENTRY
+#else
+#  define GL_CALL
+#endif
+
 #ifdef GL_ARB_debug_output
-static void glDebugOut(GLenum source, GLenum type, GLuint id, GLenum severity,
-                       GLsizei length, GLchar const *message, void const *userParam)
+static void GL_CALL glDebugOut(GLenum source, GLenum type, GLuint id, GLenum severity,
+                               GLsizei length, GLchar const *message, GLvoid *userParam)
 {
     DENG2_UNUSED(source);
     DENG2_UNUSED(type);