diff options
| author | David Robillard <d@drobilla.net> | 2021-05-24 09:16:08 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2021-05-24 09:42:59 -0400 |
| commit | 3d78a073d90d8f232604fbdc76a6a583ffab364b (patch) | |
| tree | 75233415a2ad06ae2927eb7118655c52a4490c15 /examples | |
| parent | 07ba65842428ad50367847c7236881d814620ef4 (diff) | |
| download | pugl-3d78a073d90d8f232604fbdc76a6a583ffab364b.tar.gz pugl-3d78a073d90d8f232604fbdc76a6a583ffab364b.tar.bz2 pugl-3d78a073d90d8f232604fbdc76a6a583ffab364b.zip | |
Consistently refer to C++ as "cpp" and fix installation
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/meson.build | 8 | ||||
| -rw-r--r-- | examples/pugl_cpp_demo.cpp (renamed from examples/pugl_cxx_demo.cpp) | 2 | ||||
| -rw-r--r-- | examples/pugl_vulkan_cpp_demo.cpp (renamed from examples/pugl_vulkan_cxx_demo.cpp) | 0 | ||||
| -rw-r--r-- | examples/pugl_vulkan_demo.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/examples/meson.build b/examples/meson.build index a0b851c..5f2f9b4 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -2,7 +2,7 @@ data_dir = get_option('prefix') / get_option('datadir') / 'pugl-0' example_args = ['-DPUGL_DATA_DIR="@0@"'.format(data_dir)] gl_examples = [ - 'pugl_cxx_demo.cpp', + 'pugl_cpp_demo.cpp', 'pugl_embed_demo.c', 'pugl_print_events.c', 'pugl_shader_demo.c', @@ -14,14 +14,14 @@ cairo_examples = [ ] vulkan_examples = [ - 'pugl_vulkan_cxx_demo.cpp', + 'pugl_vulkan_cpp_demo.cpp', 'pugl_vulkan_demo.c', ] includes = include_directories( '.', '..', - '../bindings/cxx/include', + '../bindings/cpp/include', '../include', ) @@ -67,7 +67,7 @@ if vulkan_dep.found() target = example.split('.')[0] dependencies = [dl_dep, vulkan_backend_dep] - if target == 'pugl_vulkan_cxx_demo' + if target == 'pugl_vulkan_cpp_demo' source += ['file_utils.c'] endif diff --git a/examples/pugl_cxx_demo.cpp b/examples/pugl_cpp_demo.cpp index d663a3f..e49c416 100644 --- a/examples/pugl_cxx_demo.cpp +++ b/examples/pugl_cpp_demo.cpp @@ -112,7 +112,7 @@ main(int argc, char** argv) { const PuglTestOptions opts = puglParseTestOptions(&argc, &argv); if (opts.help) { - puglPrintTestUsage("pugl_cxx_demo", ""); + puglPrintTestUsage("pugl_cpp_demo", ""); return 1; } diff --git a/examples/pugl_vulkan_cxx_demo.cpp b/examples/pugl_vulkan_cpp_demo.cpp index d92e652..d92e652 100644 --- a/examples/pugl_vulkan_cxx_demo.cpp +++ b/examples/pugl_vulkan_cpp_demo.cpp diff --git a/examples/pugl_vulkan_demo.c b/examples/pugl_vulkan_demo.c index efbf339..801b74b 100644 --- a/examples/pugl_vulkan_demo.c +++ b/examples/pugl_vulkan_demo.c @@ -19,7 +19,7 @@ A simple example of drawing with Vulkan. For a more advanced demo that actually draws something interesting, see - pugl_vulkan_cxx_demo.cpp. + pugl_vulkan_cpp_demo.cpp. */ #include "demo_utils.h" |