Mercurial > hg > orthanc-stone

changeset 855:41d22389a7d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 19 Jun 2019 14:12:28 +0200
parents 99628da4d846 (current diff) bb88686acecc (diff)
children 0c0fc20a6902 e3c56d4f863f
files
diffstat 1 files changed, 12 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- 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