diff options
Diffstat (limited to 'examples')
23 files changed, 27 insertions, 45 deletions
diff --git a/examples/cube_view.h b/examples/cube_view.h index 6941870..a02154f 100644 --- a/examples/cube_view.h +++ b/examples/cube_view.h @@ -8,8 +8,8 @@ #include "demo_utils.h" -#include "pugl/gl.h" -#include "pugl/pugl.h" +#include <pugl/gl.h> +#include <pugl/pugl.h> #include <stdbool.h> diff --git a/examples/demo_utils.h b/examples/demo_utils.h index da3b2cd..db66b21 100644 --- a/examples/demo_utils.h +++ b/examples/demo_utils.h @@ -4,7 +4,7 @@ #ifndef EXAMPLES_DEMO_UTILS_H #define EXAMPLES_DEMO_UTILS_H -#include "pugl/pugl.h" +#include <pugl/pugl.h> #include <math.h> #include <stdio.h> diff --git a/examples/meson.build b/examples/meson.build index 8206a10..6a58619 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -27,11 +27,6 @@ vulkan_examples = [ 'pugl_vulkan_demo.c', ] -includes = include_directories( - '../bindings/cpp/include', - '../include', -) - # Suppress some additional C warnings in examples example_c_args = [] if get_option('warning_level') == 'everything' @@ -128,7 +123,6 @@ else c_args: example_defines + example_c_args + defines, cpp_args: example_defines + example_cpp_args + defines, dependencies: dependencies, - include_directories: includes, ) endforeach @@ -160,7 +154,6 @@ else c_args: example_defines + example_c_args + defines, cpp_args: example_defines + example_cpp_args + defines, dependencies: dependencies, - include_directories: includes, ) endforeach endif @@ -174,7 +167,6 @@ else example, c_args: example_defines + example_c_args + cairo_args, dependencies: [pugl_dep, pugl_cairo_dep, puglutil_dep], - include_directories: includes, ) endforeach endif @@ -203,7 +195,6 @@ else c_args: example_defines + example_c_args + defines, cpp_args: example_defines + example_cpp_args + defines, dependencies: dependencies, - include_directories: includes, ) endforeach endif diff --git a/examples/pugl_cairo_demo.app/MacOS/meson.build b/examples/pugl_cairo_demo.app/MacOS/meson.build index 66221c7..6143429 100644 --- a/examples/pugl_cairo_demo.app/MacOS/meson.build +++ b/examples/pugl_cairo_demo.app/MacOS/meson.build @@ -7,5 +7,4 @@ executable( c_args: example_defines + example_c_args + cairo_args, cpp_args: example_defines + example_cpp_args, dependencies: [pugl_dep, pugl_cairo_dep, puglutil_dep], - include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_cairo_demo.c b/examples/pugl_cairo_demo.c index 1c16a93..4af0b37 100644 --- a/examples/pugl_cairo_demo.c +++ b/examples/pugl_cairo_demo.c @@ -5,8 +5,8 @@ #include "puglutil/test_utils.h" -#include "pugl/cairo.h" -#include "pugl/pugl.h" +#include <pugl/cairo.h> +#include <pugl/pugl.h> #include <cairo.h> diff --git a/examples/pugl_clipboard_demo.c b/examples/pugl_clipboard_demo.c index 2f1fdbe..0defc65 100644 --- a/examples/pugl_clipboard_demo.c +++ b/examples/pugl_clipboard_demo.c @@ -7,8 +7,8 @@ #include "puglutil/test_utils.h" -#include "pugl/gl.h" -#include "pugl/pugl.h" +#include <pugl/gl.h> +#include <pugl/pugl.h> #include <math.h> #include <stdbool.h> diff --git a/examples/pugl_cpp_demo.app/MacOS/meson.build b/examples/pugl_cpp_demo.app/MacOS/meson.build index b840771..a8eda53 100644 --- a/examples/pugl_cpp_demo.app/MacOS/meson.build +++ b/examples/pugl_cpp_demo.app/MacOS/meson.build @@ -7,5 +7,4 @@ executable( c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, dependencies: [puglpp_dep, pugl_gl_dep, puglutil_dep], - include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_cpp_demo.cpp b/examples/pugl_cpp_demo.cpp index 37efe45..e6075ff 100644 --- a/examples/pugl_cpp_demo.cpp +++ b/examples/pugl_cpp_demo.cpp @@ -6,9 +6,9 @@ #include "puglutil/test_utils.h" -#include "pugl/gl.hpp" -#include "pugl/pugl.h" -#include "pugl/pugl.hpp" +#include <pugl/gl.hpp> +#include <pugl/pugl.h> +#include <pugl/pugl.hpp> #include <cmath> diff --git a/examples/pugl_cursor_demo.app/MacOS/meson.build b/examples/pugl_cursor_demo.app/MacOS/meson.build index 54670ad..6e6209a 100644 --- a/examples/pugl_cursor_demo.app/MacOS/meson.build +++ b/examples/pugl_cursor_demo.app/MacOS/meson.build @@ -7,5 +7,4 @@ executable( c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, dependencies: [pugl_dep, pugl_gl_dep, puglutil_dep], - include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_cursor_demo.c b/examples/pugl_cursor_demo.c index a70a5eb..0783b88 100644 --- a/examples/pugl_cursor_demo.c +++ b/examples/pugl_cursor_demo.c @@ -3,8 +3,8 @@ #include "puglutil/test_utils.h" -#include "pugl/gl.h" -#include "pugl/pugl.h" +#include <pugl/gl.h> +#include <pugl/pugl.h> #include <stdbool.h> diff --git a/examples/pugl_embed_demo.app/MacOS/meson.build b/examples/pugl_embed_demo.app/MacOS/meson.build index 3bef9c1..65f2fdf 100644 --- a/examples/pugl_embed_demo.app/MacOS/meson.build +++ b/examples/pugl_embed_demo.app/MacOS/meson.build @@ -7,5 +7,4 @@ executable( c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, dependencies: [pugl_dep, pugl_gl_dep, puglutil_dep], - include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_embed_demo.c b/examples/pugl_embed_demo.c index ff6a63e..61adf5c 100644 --- a/examples/pugl_embed_demo.c +++ b/examples/pugl_embed_demo.c @@ -6,8 +6,8 @@ #include "puglutil/test_utils.h" -#include "pugl/gl.h" -#include "pugl/pugl.h" +#include <pugl/gl.h> +#include <pugl/pugl.h> #include <math.h> #include <stdbool.h> diff --git a/examples/pugl_management_demo.app/MacOS/meson.build b/examples/pugl_management_demo.app/MacOS/meson.build index 31604f6..fedcd17 100644 --- a/examples/pugl_management_demo.app/MacOS/meson.build +++ b/examples/pugl_management_demo.app/MacOS/meson.build @@ -7,5 +7,4 @@ executable( c_args: example_defines + example_c_args + cairo_args, cpp_args: example_defines + example_cpp_args, dependencies: [pugl_dep, pugl_cairo_dep, puglutil_dep], - include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_management_demo.c b/examples/pugl_management_demo.c index 156b2dd..6e42efa 100644 --- a/examples/pugl_management_demo.c +++ b/examples/pugl_management_demo.c @@ -7,8 +7,8 @@ #include "puglutil/test_utils.h" -#include "pugl/cairo.h" -#include "pugl/pugl.h" +#include <pugl/cairo.h> +#include <pugl/pugl.h> #include <cairo.h> diff --git a/examples/pugl_print_events.c b/examples/pugl_print_events.c index 7f5fe21..0ec4e65 100644 --- a/examples/pugl_print_events.c +++ b/examples/pugl_print_events.c @@ -3,8 +3,8 @@ #include "puglutil/test_utils.h" -#include "pugl/pugl.h" -#include "pugl/stub.h" +#include <pugl/pugl.h> +#include <pugl/stub.h> #include <stdbool.h> #include <stdio.h> diff --git a/examples/pugl_shader_demo.app/MacOS/meson.build b/examples/pugl_shader_demo.app/MacOS/meson.build index 9507e17..5bdc06e 100644 --- a/examples/pugl_shader_demo.app/MacOS/meson.build +++ b/examples/pugl_shader_demo.app/MacOS/meson.build @@ -11,5 +11,4 @@ executable( c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, dependencies: [pugl_dep, pugl_gl_dep, dl_dep, puglutil_dep], - include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_shader_demo.c b/examples/pugl_shader_demo.c index 209e8bd..d89cd7d 100644 --- a/examples/pugl_shader_demo.c +++ b/examples/pugl_shader_demo.c @@ -30,8 +30,8 @@ #include "glad/glad.h" -#include "pugl/gl.h" -#include "pugl/pugl.h" +#include <pugl/gl.h> +#include <pugl/pugl.h> #include <math.h> #include <stddef.h> diff --git a/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build b/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build index 08078a0..5bb9729 100644 --- a/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build +++ b/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build @@ -10,5 +10,4 @@ executable( c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, dependencies: [puglpp_dep, pugl_vulkan_dep, puglutil_dep], - include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_vulkan_cpp_demo.cpp b/examples/pugl_vulkan_cpp_demo.cpp index 16f9778..9f1a3ed 100644 --- a/examples/pugl_vulkan_cpp_demo.cpp +++ b/examples/pugl_vulkan_cpp_demo.cpp @@ -22,9 +22,9 @@ #include "sybok.hpp" -#include "pugl/pugl.h" -#include "pugl/pugl.hpp" -#include "pugl/vulkan.hpp" +#include <pugl/pugl.h> +#include <pugl/pugl.hpp> +#include <pugl/vulkan.hpp> #include <vulkan/vk_platform.h> diff --git a/examples/pugl_vulkan_demo.app/MacOS/meson.build b/examples/pugl_vulkan_demo.app/MacOS/meson.build index 172b8a4..f7ef1a4 100644 --- a/examples/pugl_vulkan_demo.app/MacOS/meson.build +++ b/examples/pugl_vulkan_demo.app/MacOS/meson.build @@ -9,5 +9,4 @@ executable( ], c_args: example_defines + example_c_args, dependencies: [pugl_dep, pugl_vulkan_dep, puglutil_dep], - include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_vulkan_demo.c b/examples/pugl_vulkan_demo.c index 6b9f03d..6c59af0 100644 --- a/examples/pugl_vulkan_demo.c +++ b/examples/pugl_vulkan_demo.c @@ -13,8 +13,8 @@ #include "puglutil/test_utils.h" -#include "pugl/pugl.h" -#include "pugl/vulkan.h" +#include <pugl/pugl.h> +#include <pugl/vulkan.h> #include <vulkan/vk_platform.h> #include <vulkan/vulkan_core.h> diff --git a/examples/pugl_window_demo.app/MacOS/meson.build b/examples/pugl_window_demo.app/MacOS/meson.build index d1f7b98..6c0f0de 100644 --- a/examples/pugl_window_demo.app/MacOS/meson.build +++ b/examples/pugl_window_demo.app/MacOS/meson.build @@ -7,5 +7,4 @@ executable( c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, dependencies: [pugl_dep, pugl_gl_dep, puglutil_dep], - include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_window_demo.c b/examples/pugl_window_demo.c index 757c0f9..18755c3 100644 --- a/examples/pugl_window_demo.c +++ b/examples/pugl_window_demo.c @@ -10,8 +10,8 @@ #include "puglutil/test_utils.h" -#include "pugl/gl.h" -#include "pugl/pugl.h" +#include <pugl/gl.h> +#include <pugl/pugl.h> #include <math.h> #include <stdbool.h> |