Remove GL and GLU wrapper headers

Include them in pugl_gl.h instead, to simplify things and unclutter the include directory.
lv2 · Oct 30, 2020 · 09fd119 · 09fd119
1 parent d3d0c55
commit 09fd119
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 89 deletions.
diff --git a/examples/cube_view.h b/examples/cube_view.h
@@ -21,7 +21,7 @@
 
 #include "demo_utils.h"
 
-#include "pugl/gl.h"
+#include "pugl/pugl_gl.h"
 
 // clang-format off
 

diff --git a/examples/pugl_cursor_demo.c b/examples/pugl_cursor_demo.c
@@ -21,7 +21,6 @@
 
 #include "test/test_utils.h"
 
-#include "pugl/gl.h"
 #include "pugl/pugl.h"
 #include "pugl/pugl_gl.h"
 

diff --git a/examples/pugl_embed_demo.c b/examples/pugl_embed_demo.c
@@ -23,7 +23,6 @@
 #include "demo_utils.h"
 #include "test/test_utils.h"
 
-#include "pugl/gl.h"
 #include "pugl/pugl.h"
 #include "pugl/pugl_gl.h"
 

diff --git a/include/pugl/gl.h b/include/pugl/gl.h
diff --git a/include/pugl/glu.h b/include/pugl/glu.h
diff --git a/include/pugl/pugl_gl.h b/include/pugl/pugl_gl.h
@@ -24,6 +24,35 @@
 
 #include "pugl/pugl.h"
 
+// IWYU pragma: begin_exports
+
+/* Unfortunately, GL includes vary across platforms, so include them here to
+   enable pure portable programs. */
+
+#ifndef PUGL_NO_INCLUDE_GL_H
+#	ifdef __APPLE__
+#		include "OpenGL/gl.h"
+#	else
+#		ifdef _WIN32
+#			include <windows.h>
+#		endif
+#		include "GL/gl.h"
+#	endif
+#endif
+
+#ifndef PUGL_NO_INCLUDE_GLU_H
+#	ifdef __APPLE__
+#		include "OpenGL/glu.h"
+#	else
+#		ifdef _WIN32
+#			include <windows.h>
+#		endif
+#		include "GL/glu.h"
+#	endif
+#endif
+
+// IWYU pragma: end_exports
+
 PUGL_BEGIN_DECLS
 
 /**

diff --git a/test/test_build.c b/test/test_build.c
@@ -20,8 +20,6 @@
 
 #define PUGL_DISABLE_DEPRECATED
 
-#include "pugl/gl.h"         // IWYU pragma: keep
-#include "pugl/glu.h"        // IWYU pragma: keep
 #include "pugl/pugl.h"       // IWYU pragma: keep
 #include "pugl/pugl_cairo.h" // IWYU pragma: keep
 #include "pugl/pugl_gl.h"    // IWYU pragma: keep

diff --git a/test/test_build.cpp b/test/test_build.cpp
@@ -20,8 +20,6 @@
 
 #define PUGL_DISABLE_DEPRECATED
 
-#include "pugl/gl.h"           // IWYU pragma: keep
-#include "pugl/glu.h"          // IWYU pragma: keep
 #include "pugl/pugl.h"         // IWYU pragma: keep
 #include "pugl/pugl.hpp"       // IWYU pragma: keep
 #include "pugl/pugl.ipp"       // IWYU pragma: keep