From bedaf7d16c3537319bc1415a6c5977bd1fe079dc Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 3 May 2023 11:48:53 -0400 Subject: Use consistent names for internal meson dependencies --- examples/meson.build | 10 +++++----- examples/pugl_cairo_demo.app/MacOS/meson.build | 2 +- examples/pugl_clipboard_demo.app/MacOS/meson.build | 2 +- examples/pugl_cpp_demo.app/MacOS/meson.build | 2 +- examples/pugl_cursor_demo.app/MacOS/meson.build | 2 +- examples/pugl_embed_demo.app/MacOS/meson.build | 2 +- examples/pugl_management_demo.app/MacOS/meson.build | 2 +- examples/pugl_shader_demo.app/MacOS/meson.build | 2 +- examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build | 2 +- examples/pugl_vulkan_demo.app/MacOS/meson.build | 2 +- examples/pugl_window_demo.app/MacOS/meson.build | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) (limited to 'examples') diff --git a/examples/meson.build b/examples/meson.build index 2b4e5f1..b1ac7a6 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -113,7 +113,7 @@ else foreach example : stub_examples source = [example] target = example.split('.')[0] - dependencies = [pugl_dep, stub_backend_dep] + dependencies = [pugl_dep, pugl_stub_dep] defines = [] executable( @@ -131,7 +131,7 @@ else foreach example : gl_examples source = [example] target = example.split('.')[0] - dependencies = [pugl_dep, gl_backend_dep] + dependencies = [pugl_dep, pugl_gl_dep] defines = [] if target == 'pugl_shader_demo' @@ -139,7 +139,7 @@ else dependencies += [dl_dep] defines += ['-D_POSIX_C_SOURCE=200809L'] elif target == 'pugl_print_events' - dependencies += [stub_backend_dep] + dependencies += [pugl_stub_dep] elif target == 'pugl_cpp_demo' dependencies += [puglpp_dep] endif @@ -163,7 +163,7 @@ else target, example, c_args: example_defines + example_c_args + cairo_args, - dependencies: [pugl_dep, cairo_backend_dep], + dependencies: [pugl_dep, pugl_cairo_dep], include_directories: includes, ) endforeach @@ -174,7 +174,7 @@ else foreach example : vulkan_examples source = [example] target = example.split('.')[0] - dependencies = [dl_dep, vulkan_backend_dep] + dependencies = [dl_dep, pugl_vulkan_dep] defines = [] if target == 'pugl_vulkan_cpp_demo' diff --git a/examples/pugl_cairo_demo.app/MacOS/meson.build b/examples/pugl_cairo_demo.app/MacOS/meson.build index 21277a5..18e1fcf 100644 --- a/examples/pugl_cairo_demo.app/MacOS/meson.build +++ b/examples/pugl_cairo_demo.app/MacOS/meson.build @@ -6,6 +6,6 @@ executable( ['../../pugl_cairo_demo.c'], c_args: example_defines + example_c_args + cairo_args, cpp_args: example_defines + example_cpp_args, - dependencies: [pugl_dep, cairo_backend_dep], + dependencies: [pugl_dep, pugl_cairo_dep], include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_clipboard_demo.app/MacOS/meson.build b/examples/pugl_clipboard_demo.app/MacOS/meson.build index f27ce56..31ad2f0 100644 --- a/examples/pugl_clipboard_demo.app/MacOS/meson.build +++ b/examples/pugl_clipboard_demo.app/MacOS/meson.build @@ -5,6 +5,6 @@ executable( 'pugl_clipboard_demo', '../../pugl_clipboard_demo.c', c_args: example_defines + example_c_args, - dependencies: [pugl_dep, gl_backend_dep], + dependencies: [pugl_dep, pugl_gl_dep], include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_cpp_demo.app/MacOS/meson.build b/examples/pugl_cpp_demo.app/MacOS/meson.build index 9b5393b..f5ddd67 100644 --- a/examples/pugl_cpp_demo.app/MacOS/meson.build +++ b/examples/pugl_cpp_demo.app/MacOS/meson.build @@ -6,6 +6,6 @@ executable( '../../pugl_cpp_demo.cpp', c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, - dependencies: [puglpp_dep, gl_backend_dep], + dependencies: [puglpp_dep, pugl_gl_dep], include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_cursor_demo.app/MacOS/meson.build b/examples/pugl_cursor_demo.app/MacOS/meson.build index 4de8b40..94359cd 100644 --- a/examples/pugl_cursor_demo.app/MacOS/meson.build +++ b/examples/pugl_cursor_demo.app/MacOS/meson.build @@ -6,6 +6,6 @@ executable( '../../pugl_cursor_demo.c', c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, - dependencies: [pugl_dep, gl_backend_dep], + dependencies: [pugl_dep, pugl_gl_dep], include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_embed_demo.app/MacOS/meson.build b/examples/pugl_embed_demo.app/MacOS/meson.build index 13df15e..9e6dd58 100644 --- a/examples/pugl_embed_demo.app/MacOS/meson.build +++ b/examples/pugl_embed_demo.app/MacOS/meson.build @@ -6,6 +6,6 @@ executable( '../../pugl_embed_demo.c', c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, - dependencies: [pugl_dep, gl_backend_dep], + dependencies: [pugl_dep, pugl_gl_dep], include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_management_demo.app/MacOS/meson.build b/examples/pugl_management_demo.app/MacOS/meson.build index 1ad7b21..69dafc7 100644 --- a/examples/pugl_management_demo.app/MacOS/meson.build +++ b/examples/pugl_management_demo.app/MacOS/meson.build @@ -6,6 +6,6 @@ executable( ['../../pugl_management_demo.c'], c_args: example_defines + example_c_args + cairo_args, cpp_args: example_defines + example_cpp_args, - dependencies: [pugl_dep, cairo_backend_dep], + dependencies: [pugl_dep, pugl_cairo_dep], include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_shader_demo.app/MacOS/meson.build b/examples/pugl_shader_demo.app/MacOS/meson.build index ea35862..0731864 100644 --- a/examples/pugl_shader_demo.app/MacOS/meson.build +++ b/examples/pugl_shader_demo.app/MacOS/meson.build @@ -10,6 +10,6 @@ executable( ], c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, - dependencies: [pugl_dep, gl_backend_dep, dl_dep], + dependencies: [pugl_dep, pugl_gl_dep, dl_dep], include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build b/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build index abecfb5..d75c75d 100644 --- a/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build +++ b/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build @@ -9,6 +9,6 @@ executable( ], c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, - dependencies: [puglpp_dep, vulkan_backend_dep], + dependencies: [puglpp_dep, pugl_vulkan_dep], include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_vulkan_demo.app/MacOS/meson.build b/examples/pugl_vulkan_demo.app/MacOS/meson.build index fb7273f..0d07171 100644 --- a/examples/pugl_vulkan_demo.app/MacOS/meson.build +++ b/examples/pugl_vulkan_demo.app/MacOS/meson.build @@ -8,6 +8,6 @@ executable( '../../file_utils.c', ], c_args: example_defines + example_c_args, - dependencies: [pugl_dep, vulkan_backend_dep], + dependencies: [pugl_dep, pugl_vulkan_dep], include_directories: include_directories('../../..'), ) diff --git a/examples/pugl_window_demo.app/MacOS/meson.build b/examples/pugl_window_demo.app/MacOS/meson.build index 9794cd4..7bfc219 100644 --- a/examples/pugl_window_demo.app/MacOS/meson.build +++ b/examples/pugl_window_demo.app/MacOS/meson.build @@ -6,6 +6,6 @@ executable( '../../pugl_window_demo.c', c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, - dependencies: [pugl_dep, gl_backend_dep], + dependencies: [pugl_dep, pugl_gl_dep], include_directories: include_directories('../../..'), ) -- cgit v1.2.1