aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Fisher <mfisher@kushview.net>2022-08-27 11:09:00 -0400
committerDavid Robillard <d@drobilla.net>2022-08-31 17:04:21 -0400
commitc3bc53d45d26363da38ede93eaeb9aa6145643e3 (patch)
tree2c154dfaa43b3c8268fe8765eba4cc2cf64f6a74
parent5d2da056d00b71d411f2ec2313cb7c76b31d3083 (diff)
downloadpugl-c3bc53d45d26363da38ede93eaeb9aa6145643e3.tar.gz
pugl-c3bc53d45d26363da38ede93eaeb9aa6145643e3.tar.bz2
pugl-c3bc53d45d26363da38ede93eaeb9aa6145643e3.zip
Add include_directories to pugl_dep
-rw-r--r--examples/pugl_cairo_demo.app/MacOS/meson.build2
-rw-r--r--examples/pugl_clipboard_demo.app/MacOS/meson.build2
-rw-r--r--examples/pugl_cpp_demo.app/MacOS/meson.build2
-rw-r--r--examples/pugl_cursor_demo.app/MacOS/meson.build2
-rw-r--r--examples/pugl_embed_demo.app/MacOS/meson.build2
-rw-r--r--examples/pugl_shader_demo.app/MacOS/meson.build2
-rw-r--r--examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build2
-rw-r--r--examples/pugl_vulkan_demo.app/MacOS/meson.build2
-rw-r--r--examples/pugl_window_demo.app/MacOS/meson.build2
-rw-r--r--meson.build4
10 files changed, 12 insertions, 10 deletions
diff --git a/examples/pugl_cairo_demo.app/MacOS/meson.build b/examples/pugl_cairo_demo.app/MacOS/meson.build
index 8bfee99..1b9740c 100644
--- a/examples/pugl_cairo_demo.app/MacOS/meson.build
+++ b/examples/pugl_cairo_demo.app/MacOS/meson.build
@@ -1,7 +1,7 @@
executable(
'pugl_cairo_demo',
['../../pugl_cairo_demo.c'],
- include_directories: include_directories('../../../../include', '../../..'),
+ include_directories: include_directories('../../..'),
c_args: example_defines + example_c_args + cairo_args,
cpp_args: example_defines + example_cpp_args,
dependencies: [pugl_dep, cairo_backend_dep])
diff --git a/examples/pugl_clipboard_demo.app/MacOS/meson.build b/examples/pugl_clipboard_demo.app/MacOS/meson.build
index 1fcb023..2f2ebb9 100644
--- a/examples/pugl_clipboard_demo.app/MacOS/meson.build
+++ b/examples/pugl_clipboard_demo.app/MacOS/meson.build
@@ -4,6 +4,6 @@
executable(
'pugl_clipboard_demo',
'../../pugl_clipboard_demo.c',
- include_directories: include_directories('../../../../include', '../../..'),
+ include_directories: include_directories('../../..'),
c_args: example_defines + example_c_args,
dependencies: [pugl_dep, gl_backend_dep])
diff --git a/examples/pugl_cpp_demo.app/MacOS/meson.build b/examples/pugl_cpp_demo.app/MacOS/meson.build
index 5317789..c32600d 100644
--- a/examples/pugl_cpp_demo.app/MacOS/meson.build
+++ b/examples/pugl_cpp_demo.app/MacOS/meson.build
@@ -1,7 +1,7 @@
executable(
'pugl_cpp_demo',
'../../pugl_cpp_demo.cpp',
- include_directories: include_directories('../../../../include', '../../..'),
+ include_directories: include_directories('../../..'),
c_args: example_defines + example_c_args,
cpp_args: example_defines + example_cpp_args,
dependencies: [puglpp_dep, gl_backend_dep])
diff --git a/examples/pugl_cursor_demo.app/MacOS/meson.build b/examples/pugl_cursor_demo.app/MacOS/meson.build
index d702c49..f812489 100644
--- a/examples/pugl_cursor_demo.app/MacOS/meson.build
+++ b/examples/pugl_cursor_demo.app/MacOS/meson.build
@@ -1,7 +1,7 @@
executable(
'pugl_cursor_demo',
'../../pugl_cursor_demo.c',
- include_directories: include_directories('../../../../include', '../../..'),
+ include_directories: include_directories('../../..'),
c_args: example_defines + example_c_args,
cpp_args: example_defines + example_cpp_args,
dependencies: [pugl_dep, gl_backend_dep])
diff --git a/examples/pugl_embed_demo.app/MacOS/meson.build b/examples/pugl_embed_demo.app/MacOS/meson.build
index 4ad3781..75634ce 100644
--- a/examples/pugl_embed_demo.app/MacOS/meson.build
+++ b/examples/pugl_embed_demo.app/MacOS/meson.build
@@ -1,7 +1,7 @@
executable(
'pugl_embed_demo',
'../../pugl_embed_demo.c',
- include_directories: include_directories('../../../../include', '../../..'),
+ include_directories: include_directories('../../..'),
c_args: example_defines + example_c_args,
cpp_args: example_defines + example_cpp_args,
dependencies: [pugl_dep, gl_backend_dep])
diff --git a/examples/pugl_shader_demo.app/MacOS/meson.build b/examples/pugl_shader_demo.app/MacOS/meson.build
index 3eb9ae1..998f2df 100644
--- a/examples/pugl_shader_demo.app/MacOS/meson.build
+++ b/examples/pugl_shader_demo.app/MacOS/meson.build
@@ -5,7 +5,7 @@ executable(
'../../glad/glad.c',
'../../pugl_shader_demo.c',
],
- include_directories: include_directories('../../../../include', '../../..'),
+ include_directories: include_directories('../../..'),
c_args: example_defines + example_c_args,
cpp_args: example_defines + example_cpp_args,
dependencies: [pugl_dep, gl_backend_dep, dl_dep])
diff --git a/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build b/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build
index 2ff4e87..b0f9ca0 100644
--- a/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build
+++ b/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build
@@ -4,7 +4,7 @@ executable(
'../../pugl_vulkan_cpp_demo.cpp',
'../../file_utils.c',
],
- include_directories: include_directories('../../../../include', '../../..'),
+ include_directories: include_directories('../../..'),
c_args: example_defines + example_c_args,
cpp_args: example_defines + example_cpp_args,
dependencies: [puglpp_dep, vulkan_backend_dep])
diff --git a/examples/pugl_vulkan_demo.app/MacOS/meson.build b/examples/pugl_vulkan_demo.app/MacOS/meson.build
index d2863b3..61f3152 100644
--- a/examples/pugl_vulkan_demo.app/MacOS/meson.build
+++ b/examples/pugl_vulkan_demo.app/MacOS/meson.build
@@ -4,6 +4,6 @@ executable(
'../../pugl_vulkan_demo.c',
'../../file_utils.c',
],
- include_directories: include_directories('../../../../include', '../../..'),
+ include_directories: include_directories('../../..'),
c_args: example_defines + example_c_args,
dependencies: [pugl_dep, vulkan_backend_dep])
diff --git a/examples/pugl_window_demo.app/MacOS/meson.build b/examples/pugl_window_demo.app/MacOS/meson.build
index 84b4c59..5a9ff6a 100644
--- a/examples/pugl_window_demo.app/MacOS/meson.build
+++ b/examples/pugl_window_demo.app/MacOS/meson.build
@@ -1,7 +1,7 @@
executable(
'pugl_window_demo',
'../../pugl_window_demo.c',
- include_directories: include_directories('../../../../include', '../../..'),
+ include_directories: include_directories('../../..'),
c_args: example_defines + example_c_args,
cpp_args: example_defines + example_cpp_args,
dependencies: [pugl_dep, gl_backend_dep])
diff --git a/meson.build b/meson.build
index ac2e6a6..b1d3993 100644
--- a/meson.build
+++ b/meson.build
@@ -166,7 +166,9 @@ libpugl = build_target(
install: true,
target_type: library_type)
-pugl_dep = declare_dependency(link_with: libpugl, dependencies: core_deps)
+pugl_dep = declare_dependency(link_with: libpugl,
+ dependencies: core_deps,
+ include_directories: ['include'])
pkg.generate(libpugl,
name: 'Pugl',