diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/meson.build | 50 | ||||
-rw-r--r-- | examples/pugl_cairo_demo.app/MacOS/meson.build | 5 | ||||
-rw-r--r-- | examples/pugl_clipboard_demo.app/MacOS/meson.build | 5 | ||||
-rw-r--r-- | examples/pugl_cpp_demo.app/MacOS/meson.build | 5 | ||||
-rw-r--r-- | examples/pugl_cursor_demo.app/MacOS/meson.build | 5 | ||||
-rw-r--r-- | examples/pugl_embed_demo.app/MacOS/meson.build | 5 | ||||
-rw-r--r-- | examples/pugl_shader_demo.app/MacOS/meson.build | 5 | ||||
-rw-r--r-- | examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build | 5 | ||||
-rw-r--r-- | examples/pugl_vulkan_cpp_demo.app/meson.build | 24 | ||||
-rw-r--r-- | examples/pugl_vulkan_demo.app/MacOS/meson.build | 5 | ||||
-rw-r--r-- | examples/pugl_window_demo.app/MacOS/meson.build | 5 | ||||
-rw-r--r-- | examples/shaders/meson.build | 60 |
12 files changed, 106 insertions, 73 deletions
diff --git a/examples/meson.build b/examples/meson.build index db93f64..f3ff764 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -114,11 +114,14 @@ else dependencies = [pugl_dep, stub_backend_dep] defines = [] - executable(target, source, - include_directories: includes, - c_args: example_defines + example_c_args + defines, - cpp_args: example_defines + example_cpp_args + defines, - dependencies: dependencies) + executable( + target, + source, + c_args: example_defines + example_c_args + defines, + cpp_args: example_defines + example_cpp_args + defines, + dependencies: dependencies, + include_directories: includes, + ) endforeach # Build GL examples @@ -139,11 +142,14 @@ else dependencies += [puglpp_dep] endif - executable(target, source, - include_directories: includes, - c_args: example_defines + example_c_args + defines, - cpp_args: example_defines + example_cpp_args + defines, - dependencies: dependencies) + executable( + target, + source, + c_args: example_defines + example_c_args + defines, + cpp_args: example_defines + example_cpp_args + defines, + dependencies: dependencies, + include_directories: includes, + ) endforeach endif @@ -151,10 +157,13 @@ else if cairo_dep.found() foreach example : cairo_examples target = example.split('.')[0] - executable(target, example, - include_directories: includes, - c_args: example_defines + example_c_args + cairo_args, - dependencies: [pugl_dep, cairo_backend_dep]) + executable( + target, + example, + c_args: example_defines + example_c_args + cairo_args, + dependencies: [pugl_dep, cairo_backend_dep], + include_directories: includes, + ) endforeach endif @@ -171,11 +180,14 @@ else defines += ['-D_POSIX_C_SOURCE=200809L'] endif - executable(target, source, - include_directories: includes, - c_args: example_defines + example_c_args + defines, - cpp_args: example_defines + example_cpp_args + defines, - dependencies: dependencies) + executable( + target, + source, + c_args: example_defines + example_c_args + defines, + cpp_args: example_defines + example_cpp_args + defines, + dependencies: dependencies, + include_directories: includes, + ) endforeach endif endif diff --git a/examples/pugl_cairo_demo.app/MacOS/meson.build b/examples/pugl_cairo_demo.app/MacOS/meson.build index 1b9740c..5a6941a 100644 --- a/examples/pugl_cairo_demo.app/MacOS/meson.build +++ b/examples/pugl_cairo_demo.app/MacOS/meson.build @@ -1,7 +1,8 @@ executable( 'pugl_cairo_demo', ['../../pugl_cairo_demo.c'], - 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]) + dependencies: [pugl_dep, cairo_backend_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 2f2ebb9..dc12e27 100644 --- a/examples/pugl_clipboard_demo.app/MacOS/meson.build +++ b/examples/pugl_clipboard_demo.app/MacOS/meson.build @@ -4,6 +4,7 @@ executable( 'pugl_clipboard_demo', '../../pugl_clipboard_demo.c', - include_directories: include_directories('../../..'), c_args: example_defines + example_c_args, - dependencies: [pugl_dep, gl_backend_dep]) + dependencies: [pugl_dep, gl_backend_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 c32600d..5b9ba3b 100644 --- a/examples/pugl_cpp_demo.app/MacOS/meson.build +++ b/examples/pugl_cpp_demo.app/MacOS/meson.build @@ -1,7 +1,8 @@ executable( 'pugl_cpp_demo', '../../pugl_cpp_demo.cpp', - include_directories: include_directories('../../..'), c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, - dependencies: [puglpp_dep, gl_backend_dep]) + dependencies: [puglpp_dep, gl_backend_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 f812489..8ab6f6a 100644 --- a/examples/pugl_cursor_demo.app/MacOS/meson.build +++ b/examples/pugl_cursor_demo.app/MacOS/meson.build @@ -1,7 +1,8 @@ executable( 'pugl_cursor_demo', '../../pugl_cursor_demo.c', - include_directories: include_directories('../../..'), c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, - dependencies: [pugl_dep, gl_backend_dep]) + dependencies: [pugl_dep, gl_backend_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 75634ce..ba7f875 100644 --- a/examples/pugl_embed_demo.app/MacOS/meson.build +++ b/examples/pugl_embed_demo.app/MacOS/meson.build @@ -1,7 +1,8 @@ executable( 'pugl_embed_demo', '../../pugl_embed_demo.c', - include_directories: include_directories('../../..'), c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, - dependencies: [pugl_dep, gl_backend_dep]) + dependencies: [pugl_dep, gl_backend_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 998f2df..a2b0974 100644 --- a/examples/pugl_shader_demo.app/MacOS/meson.build +++ b/examples/pugl_shader_demo.app/MacOS/meson.build @@ -5,7 +5,8 @@ executable( '../../glad/glad.c', '../../pugl_shader_demo.c', ], - 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]) + dependencies: [pugl_dep, gl_backend_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 b0f9ca0..b120b32 100644 --- a/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build +++ b/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build @@ -4,7 +4,8 @@ executable( '../../pugl_vulkan_cpp_demo.cpp', '../../file_utils.c', ], - include_directories: include_directories('../../..'), c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, - dependencies: [puglpp_dep, vulkan_backend_dep]) + dependencies: [puglpp_dep, vulkan_backend_dep], + include_directories: include_directories('../../..'), +) diff --git a/examples/pugl_vulkan_cpp_demo.app/meson.build b/examples/pugl_vulkan_cpp_demo.app/meson.build index 90b2329..58a943c 100644 --- a/examples/pugl_vulkan_cpp_demo.app/meson.build +++ b/examples/pugl_vulkan_cpp_demo.app/meson.build @@ -12,16 +12,20 @@ shaders = [ cp = find_program('../../scripts/cp.py') -custom_target('rect.vert.spv', - input: rect_vert_spv, - output: 'rect.vert.spv', - command: [cp, '@INPUT@', '@OUTPUT@'], - build_by_default: true) +custom_target( + 'rect.vert.spv', + build_by_default: true, + command: [cp, '@INPUT@', '@OUTPUT@'], + input: rect_vert_spv, + output: 'rect.vert.spv', +) -custom_target('rect.frag.spv', - input: rect_frag_spv, - output: 'rect.frag.spv', - command: [cp, '@INPUT@', '@OUTPUT@'], - build_by_default: true) +custom_target( + 'rect.frag.spv', + build_by_default: true, + command: [cp, '@INPUT@', '@OUTPUT@'], + input: rect_frag_spv, + output: 'rect.frag.spv', +) subdir('MacOS') diff --git a/examples/pugl_vulkan_demo.app/MacOS/meson.build b/examples/pugl_vulkan_demo.app/MacOS/meson.build index 61f3152..a6560a6 100644 --- a/examples/pugl_vulkan_demo.app/MacOS/meson.build +++ b/examples/pugl_vulkan_demo.app/MacOS/meson.build @@ -4,6 +4,7 @@ executable( '../../pugl_vulkan_demo.c', '../../file_utils.c', ], - include_directories: include_directories('../../..'), c_args: example_defines + example_c_args, - dependencies: [pugl_dep, vulkan_backend_dep]) + dependencies: [pugl_dep, vulkan_backend_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 5a9ff6a..729e1a4 100644 --- a/examples/pugl_window_demo.app/MacOS/meson.build +++ b/examples/pugl_window_demo.app/MacOS/meson.build @@ -1,7 +1,8 @@ executable( 'pugl_window_demo', '../../pugl_window_demo.c', - include_directories: include_directories('../../..'), c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, - dependencies: [pugl_dep, gl_backend_dep]) + dependencies: [pugl_dep, gl_backend_dep], + include_directories: include_directories('../../..'), +) diff --git a/examples/shaders/meson.build b/examples/shaders/meson.build index 9121e97..c96b70c 100644 --- a/examples/shaders/meson.build +++ b/examples/shaders/meson.build @@ -18,33 +18,41 @@ if vulkan_dep.found() cat = find_program('../../scripts/cat.py') glslang = find_program('glslangValidator') - rect_vulkan_vert = custom_target('rect.vulkan.vert', - output: 'rect.vulkan.vert', - input: ['header_420.glsl', 'rect.vert'], - command: [cat, '@INPUT@'], - build_by_default: true, - capture: true) - - rect_vulkan_frag = custom_target('rect.vulkan.frag', - output: 'rect.vulkan.frag', - input: ['header_420.glsl', 'rect.frag'], - command: [cat, '@INPUT@'], - build_by_default: true, - capture: true) + rect_vulkan_vert = custom_target( + 'rect.vulkan.vert', + build_by_default: true, + capture: true, + command: [cat, '@INPUT@'], + input: ['header_420.glsl', 'rect.vert'], + output: 'rect.vulkan.vert', + ) + + rect_vulkan_frag = custom_target( + 'rect.vulkan.frag', + build_by_default: true, + capture: true, + command: [cat, '@INPUT@'], + input: ['header_420.glsl', 'rect.frag'], + output: 'rect.vulkan.frag', + ) glslang_command = [glslang, '-V', '-o', '@OUTPUT@', '@INPUT@'] - rect_vert_spv = custom_target('rect.vert.spv', - output: 'rect.vert.spv', - input: rect_vulkan_vert, - command: glslang_command, - build_by_default: true, - install: false) - - rect_frag_spv = custom_target('rect.frag.spv', - output: 'rect.frag.spv', - input: rect_vulkan_frag, - command: glslang_command, - build_by_default: true, - install: false) + rect_vert_spv = custom_target( + 'rect.vert.spv', + build_by_default: true, + command: glslang_command, + input: rect_vulkan_vert, + install: false, + output: 'rect.vert.spv', + ) + + rect_frag_spv = custom_target( + 'rect.frag.spv', + build_by_default: true, + command: glslang_command, + input: rect_vulkan_frag, + install: false, + output: 'rect.frag.spv', + ) endif |