# HG changeset patch # User Sebastien Jodogne # Date 1560940220 -7200 # Node ID bb88686aceccb3abcf587889fd5ad3f581296c46 # Parent 6d15261f9c9965a2f4b64658e318b370933b175e fix OS X build diff -r 6d15261f9c99 -r bb88686acecc Applications/Generic/GuiAdapter.cpp --- a/Applications/Generic/GuiAdapter.cpp Tue Jun 18 16:45:37 2019 +0200 +++ b/Applications/Generic/GuiAdapter.cpp Wed Jun 19 12:30:20 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 -# include -# include -# endif -#endif +#if ORTHANC_ENABLE_OPENGL == 1 +# include "../../Framework/OpenGL/OpenGLIncludes.h" +#endif + +#if ORTHANC_ENABLE_SDL == 1 +# include +# include +# include +#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