# HG changeset patch
# User Benjamin Golinvaux <bgo@osimis.io>
# Date 1560946348 -7200
# Node ID 41d22389a7d2385ff04167ab76e1b72976b7cf21
# Parent  99628da4d846e2b8246f18b3a4cf1d8b866f42d4# Parent  bb88686aceccb3abcf587889fd5ad3f581296c46
merge

diff -r 99628da4d846 -r 41d22389a7d2 Applications/Generic/GuiAdapter.cpp
--- a/Applications/Generic/GuiAdapter.cpp	Wed Jun 19 14:10:12 2019 +0200
+++ b/Applications/Generic/GuiAdapter.cpp	Wed Jun 19 14:12:28 2019 +0200
@@ -20,17 +20,18 @@
 
 #include "GuiAdapter.h"
 
-#if ORTHANC_ENABLE_SDL == 1
-# if ORTHANC_ENABLE_OPENGL == 1
-#   include "../../Framework/OpenGL/OpenGLIncludes.h"
-#   include <SDL_video.h>
-#   include <SDL_render.h>
-#   include <SDL.h>
-# endif
-#endif
+#if ORTHANC_ENABLE_OPENGL == 1
+#  include "../../Framework/OpenGL/OpenGLIncludes.h"
+#endif
+
+#if ORTHANC_ENABLE_SDL == 1
+#  include <SDL_video.h>
+#  include <SDL_render.h>
+#  include <SDL.h>
+#endif
 
 #if ORTHANC_ENABLE_THREADS == 1
-# include "../../Framework/Messages/LockingEmitter.h"
+#  include "../../Framework/Messages/LockingEmitter.h"
 #endif
 
 namespace OrthancStone
@@ -505,7 +506,7 @@
     animationFrameHandlers_.push_back(std::make_pair(func, userData));
   }
 
-# if ORTHANC_ENABLE_OPENGL == 1
+# if ORTHANC_ENABLE_OPENGL == 1 && !defined(__APPLE__)   /* OpenGL debug is not available on OS X */
 
   static void GLAPIENTRY
     OpenGLMessageCallback(GLenum source,
@@ -527,7 +528,7 @@
 
   void GuiAdapter::Run()
   {
-# if ORTHANC_ENABLE_OPENGL == 1
+# if ORTHANC_ENABLE_OPENGL == 1 && !defined(__APPLE__)
     glEnable(GL_DEBUG_OUTPUT);
     glDebugMessageCallback(OpenGLMessageCallback, 0);
 # endif