diff options
| -rw-r--r-- | examples/cube_view.h | 2 | ||||
| -rw-r--r-- | examples/pugl_cursor_demo.c | 1 | ||||
| -rw-r--r-- | examples/pugl_embed_demo.c | 1 | ||||
| -rw-r--r-- | include/pugl/gl.h | 41 | ||||
| -rw-r--r-- | include/pugl/glu.h | 41 | ||||
| -rw-r--r-- | include/pugl/pugl_gl.h | 29 | ||||
| -rw-r--r-- | test/test_build.c | 2 | ||||
| -rw-r--r-- | test/test_build.cpp | 2 |
8 files changed, 30 insertions, 89 deletions
diff --git a/examples/cube_view.h b/examples/cube_view.h index 87bf3b5..ceece42 100644 --- 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 index 4953682..ad9bb8e 100644 --- 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 index 774ac77..b481d4a 100644 --- 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 deleted file mode 100644 index 17352e1..0000000 --- a/include/pugl/gl.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - Copyright 2012-2020 David Robillard <d@drobilla.net> - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ - -/** - @file gl.h - @brief Portable header wrapper for gl.h. - - Unfortunately, GL includes vary across platforms so this header allows for - pure portable programs. -*/ - -#ifndef PUGL_GL_H -#define PUGL_GL_H - -// IWYU pragma: begin_exports - -#ifdef __APPLE__ -# include "OpenGL/gl.h" -#else -# ifdef _WIN32 -# include <windows.h> /* Broken Windows GL headers require this */ -# endif -# include "GL/gl.h" -#endif - -// IWYU pragma: end_exports - -#endif // PUGL_GL_H diff --git a/include/pugl/glu.h b/include/pugl/glu.h deleted file mode 100644 index b67b7a0..0000000 --- a/include/pugl/glu.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - Copyright 2012-2020 David Robillard <d@drobilla.net> - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ - -/** - @file glu.h - @brief Portable header wrapper for glu.h. - - Unfortunately, GL includes vary across platforms so this header allows for - pure portable programs. -*/ - -#ifndef PUGL_GLU_H -#define PUGL_GLU_H - -// IWYU pragma: begin_exports - -#ifdef __APPLE__ -# include "OpenGL/glu.h" -#else -# ifdef _WIN32 -# include <windows.h> /* Broken Windows GL headers require this */ -# endif -# include "GL/glu.h" -#endif - -// IWYU pragma: end_exports - -#endif // PUGL_GLU_H diff --git a/include/pugl/pugl_gl.h b/include/pugl/pugl_gl.h index b0100ce..78b994b 100644 --- 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 index de16e91..984d23a 100644 --- 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 index 979b7f6..e8e64ab 100644 --- 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 |