macOS: Build fixes

skyjake · Sep 1, 2019 · 7728dd1 · 7728dd1
1 parent 7af68bf
commit 7728dd1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/doomsday/apps/client/src/init_unix.cpp b/doomsday/apps/client/src/init_unix.cpp
@@ -30,7 +30,7 @@
 #include <de/App>
 
 #include "de_base.h"
-#include "dd_uinit.h"
+#include "init_unix.h"
 
 #ifdef __CLIENT__
 #  include "gl/sys_opengl.h"

diff --git a/doomsday/libs/gui/src/graphics/glinfo.cpp b/doomsday/libs/gui/src/graphics/glinfo.cpp
@@ -31,7 +31,7 @@
 #include <glbinding/Binding.h>
 
 #if defined(DE_DEBUG)
-#  define DE_ENABLE_OPENGL_DEBUG_LOGGER
+//#  define DE_ENABLE_OPENGL_DEBUG_LOGGER
 //#  include <QOpenGLDebugLogger>
 #endif
 
@@ -58,13 +58,16 @@ namespace de {
 static GLInfo info;
 
 #if defined(DE_ENABLE_OPENGL_DEBUG_LOGGER)
-extern "C" void APIENTRY debugMessageCallback(gl::GLenum source,
-                                                gl::GLenum type,
-                                     gl::GLuint id,
-                                     gl::GLenum severity,
-                                     gl::GLsizei length,
-                                     const gl::GLchar *message,
-                                     const void *userParam)
+#ifndef WIN32
+#  define APIENTRY
+#endif
+void APIENTRY debugMessageCallback(gl::GLenum source,
+                                   gl::GLenum type,
+                                   gl::GLuint id,
+                                   gl::GLenum severity,
+                                   gl::GLsizei length,
+                                   const gl::GLchar *message,
+                                   const void *userParam)
 {
     using namespace gl;