Skip to content

Commit

Permalink
Work around conda-forge's CDT version of GL
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Carroll <[email protected]>
Co-authored-by: Silvo Traversaro <[email protected]>
  • Loading branch information
mjcarroll and traversaro committed Apr 3, 2024
1 parent f6ad8a8 commit 4c5707a
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions ogre/src/OgreRenderEngine.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@
#if !defined(__APPLE__) && !defined(_WIN32)
# include <X11/Xlib.h>
# include <X11/Xutil.h>

#if !defined(kronos_intptr_t) || !defined(khronos_intptr_t)
// Conda-forge's glext.h is old and has a bug.
// This is a minimally-intrusive fix to correct types.
// On modern GL distributions, glx.h will override these.
# include <KHR/khrplatform.h>
typedef khronos_ssize_t GLsizeiptr;
typedef khronos_intptr_t GLintptr;
#endif

# include <GL/glx.h>
#endif

Expand Down

0 comments on commit 4c5707a

Please sign in to comment.