Skip to content

3 macOS-related fixes

LE-ROUX SEBASTIEN requested to merge github/fork/fxcoudert/cairo into main

Created by: fxcoudert

First commit: fix include paths to Cairo. According to all documentation I can find, the include path should be <cairo.h>, not <cairo/cairo.h>. I suspect this works on Linux anyway because /usr/include is the default include path, and so /usr/include/cairo/cairo.h happens to be available. On macOS, no such happy coincidence.

Second fix: macOS include path for glu.h is OpenGL/glu.h. Also, epoxy/glx.h does not exist on the macOS version (and does not appear to be necessary). I am guarding these fixes with the __APPLE__ macro, which is always defined by compilers running on (or targeting) macOS.

Third fix: instead of duplicating LINUX and OSX code, which are the same everywhere, we make macOS a special case of the LINUX type (which would also work, for example, on BSD platforms). We guard the specific code with __APPLE__ here again.

Merge request reports