Skip to content

Commit

Permalink
Work around conda-forge's CDT version of GL (#983)
Browse files Browse the repository at this point in the history
* Work around conda-forge's CDT version of GL

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Co-authored-by: Silvo Traversaro <silvio@traversaro.it>

* Remove unnecessary preprocessor

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>

---------

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Co-authored-by: Silvo Traversaro <silvio@traversaro.it>
  • Loading branch information
mjcarroll and traversaro committed Apr 11, 2024
1 parent f6ad8a8 commit b83ee40
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions ogre/src/OgreRenderEngine.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@
#if !defined(__APPLE__) && !defined(_WIN32)
# include <X11/Xlib.h>
# include <X11/Xutil.h>

// 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;

# include <GL/glx.h>
#endif

Expand Down

0 comments on commit b83ee40

Please sign in to comment.