aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.clant.json2
-rw-r--r--README.md4
-rw-r--r--bindings/cpp/include/.clang-tidy (renamed from bindings/cxx/include/.clang-tidy)0
-rw-r--r--bindings/cpp/include/pugl/cairo.hpp (renamed from bindings/cxx/include/pugl/cairo.hpp)4
-rw-r--r--bindings/cpp/include/pugl/gl.hpp (renamed from bindings/cxx/include/pugl/gl.hpp)4
-rw-r--r--bindings/cpp/include/pugl/pugl.hpp (renamed from bindings/cxx/include/pugl/pugl.hpp)10
-rw-r--r--bindings/cpp/include/pugl/stub.hpp (renamed from bindings/cxx/include/pugl/stub.hpp)4
-rw-r--r--bindings/cpp/include/pugl/vulkan.hpp (renamed from bindings/cxx/include/pugl/vulkan.hpp)4
-rw-r--r--doc/cpp/index.rst2
-rw-r--r--doc/cpp/meson.build4
-rw-r--r--doc/cpp/overview.rst2
-rw-r--r--examples/meson.build8
-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.c2
-rw-r--r--meson.build26
16 files changed, 42 insertions, 36 deletions
diff --git a/.clant.json b/.clant.json
index 6f48901..cb178c7 100644
--- a/.clant.json
+++ b/.clant.json
@@ -1,7 +1,7 @@
{
"version": "1.0.0",
"include_dirs": [
- "bindings/cxx/include",
+ "bindings/cpp/include",
"include"
],
"exclude_patterns": [
diff --git a/README.md b/README.md
index 6993f78..422410f 100644
--- a/README.md
+++ b/README.md
@@ -83,12 +83,12 @@ tests and demonstrations:
* `pugl_print_events` is a utility that prints all received events to the
console in a human readable format.
- * `pugl_cxx_demo` is a simple cube demo that uses the C++ API.
+ * `pugl_cpp_demo` is a simple cube demo that uses the C++ API.
* `pugl_vulkan_demo` is a simple example of using Vulkan in C that simply
clears the window.
- * `pugl_vulkan_cxx_demo` is a more advanced Vulkan demo in C++ that draws many
+ * `pugl_vulkan_cpp_demo` is a more advanced Vulkan demo in C++ that draws many
animated rectangles like `pugl_shader_demo`.
All example programs support several command line options to control various
diff --git a/bindings/cxx/include/.clang-tidy b/bindings/cpp/include/.clang-tidy
index 816223d..816223d 100644
--- a/bindings/cxx/include/.clang-tidy
+++ b/bindings/cpp/include/.clang-tidy
diff --git a/bindings/cxx/include/pugl/cairo.hpp b/bindings/cpp/include/pugl/cairo.hpp
index 15dc5de..b42af0d 100644
--- a/bindings/cxx/include/pugl/cairo.hpp
+++ b/bindings/cpp/include/pugl/cairo.hpp
@@ -23,9 +23,9 @@
namespace pugl {
/**
- @defgroup cairoxx Cairo
+ @defgroup cairopp Cairo
Cairo graphics support.
- @ingroup puglxx
+ @ingroup puglpp
@{
*/
diff --git a/bindings/cxx/include/pugl/gl.hpp b/bindings/cpp/include/pugl/gl.hpp
index 023dd45..3e23a57 100644
--- a/bindings/cxx/include/pugl/gl.hpp
+++ b/bindings/cpp/include/pugl/gl.hpp
@@ -24,9 +24,9 @@
namespace pugl {
/**
- @defgroup glxx OpenGL
+ @defgroup glpp OpenGL
OpenGL graphics support.
- @ingroup puglxx
+ @ingroup puglpp
@{
*/
diff --git a/bindings/cxx/include/pugl/pugl.hpp b/bindings/cpp/include/pugl/pugl.hpp
index fc3bb03..51cfdb8 100644
--- a/bindings/cxx/include/pugl/pugl.hpp
+++ b/bindings/cpp/include/pugl/pugl.hpp
@@ -30,7 +30,7 @@
namespace pugl {
/**
- @defgroup puglxx Pugl C++ API
+ @defgroup puglpp Pugl C++ API
Pugl C++ API wrapper.
@{
*/
@@ -81,7 +81,7 @@ private:
using Rect = PuglRect; ///< @copydoc PuglRect
/**
- @defgroup eventsxx Events
+ @defgroup eventspp Events
@{
*/
@@ -183,7 +183,7 @@ using LoopLeaveEvent = Event<PUGL_LOOP_LEAVE, PuglEventLoopLeave>;
/**
@}
- @defgroup statusxx Status
+ @defgroup statuspp Status
@{
*/
@@ -214,7 +214,7 @@ strerror(const Status status) noexcept
/**
@}
- @defgroup worldxx World
+ @defgroup worldpp World
@{
*/
@@ -325,7 +325,7 @@ public:
/**
@}
- @defgroup viewxx View
+ @defgroup viewpp View
@{
*/
diff --git a/bindings/cxx/include/pugl/stub.hpp b/bindings/cpp/include/pugl/stub.hpp
index fbafcee..e4a33c1 100644
--- a/bindings/cxx/include/pugl/stub.hpp
+++ b/bindings/cpp/include/pugl/stub.hpp
@@ -23,9 +23,9 @@
namespace pugl {
/**
- @defgroup stubxx Stub
+ @defgroup stubpp Stub
Stub graphics support.
- @ingroup puglxx
+ @ingroup puglpp
@{
*/
diff --git a/bindings/cxx/include/pugl/vulkan.hpp b/bindings/cpp/include/pugl/vulkan.hpp
index f3dbcad..d65b2d6 100644
--- a/bindings/cxx/include/pugl/vulkan.hpp
+++ b/bindings/cpp/include/pugl/vulkan.hpp
@@ -34,7 +34,7 @@
namespace pugl {
/**
- @defgroup vulkanxx Vulkan
+ @defgroup vulkanpp Vulkan
Vulkan graphics support.
Note that the Pugl C++ wrapper does not use vulkan-hpp because it is a
@@ -43,7 +43,7 @@ namespace pugl {
vulkan-hpp smart handles, it is relatively straightforward to wrap the
result of createSurface() manually.
- @ingroup puglxx
+ @ingroup puglpp
@{
*/
diff --git a/doc/cpp/index.rst b/doc/cpp/index.rst
index b11d028..76f45af 100644
--- a/doc/cpp/index.rst
+++ b/doc/cpp/index.rst
@@ -9,4 +9,4 @@ Pugl
deployment
overview
api/pugl
- api/puglxx
+ api/puglpp
diff --git a/doc/cpp/meson.build b/doc/cpp/meson.build
index d8bae11..ad25319 100644
--- a/doc/cpp/meson.build
+++ b/doc/cpp/meson.build
@@ -31,7 +31,7 @@ docs = custom_target(
output: 'singlehtml',
build_by_default: true,
install: true,
- install_dir: docdir / 'puglxx-0')
+ install_dir: docdir / 'puglpp-0')
docs = custom_target(
'C++ API Documentation (html)',
@@ -40,4 +40,4 @@ docs = custom_target(
output: 'html',
build_by_default: true,
install: true,
- install_dir: docdir / 'puglxx-0')
+ install_dir: docdir / 'puglpp-0')
diff --git a/doc/cpp/overview.rst b/doc/cpp/overview.rst
index 1928fba..faa265d 100644
--- a/doc/cpp/overview.rst
+++ b/doc/cpp/overview.rst
@@ -15,7 +15,7 @@ The C++ bindings are very lightweight and do not require virtual functions,
RTTI,
exceptions,
or linking to the C++ standard library.
-They are provided by the package ``puglxx-0`` which must be used in addition to the desired platform+backend package above.
+They are provided by the package ``puglpp-0`` which must be used in addition to the desired platform+backend package above.
The core API (excluding backend-specific components) is declared in ``pugl.hpp``:
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"
diff --git a/meson.build b/meson.build
index 02fae17..8d748e6 100644
--- a/meson.build
+++ b/meson.build
@@ -158,12 +158,12 @@ c_headers = [
c_header_files = files(c_headers)
cpp_headers = [
- 'bindings/cxx/include/pugl/pugl.hpp',
+ 'bindings/cpp/include/pugl/pugl.hpp',
- 'bindings/cxx/include/pugl/cairo.hpp',
- 'bindings/cxx/include/pugl/gl.hpp',
- 'bindings/cxx/include/pugl/stub.hpp',
- 'bindings/cxx/include/pugl/vulkan.hpp',
+ 'bindings/cpp/include/pugl/cairo.hpp',
+ 'bindings/cpp/include/pugl/gl.hpp',
+ 'bindings/cpp/include/pugl/stub.hpp',
+ 'bindings/cpp/include/pugl/vulkan.hpp',
]
cpp_header_files = files(cpp_headers)
@@ -323,7 +323,7 @@ stub_backend_dep = declare_dependency(link_with: stub_backend)
pkg.generate(stub_backend,
name: 'Pugl Stub',
filebase: 'pugl-stub-@0@'.format(major_version),
- subdirs: [name],
+ subdirs: [versioned_name],
version: meson.project_version(),
description: 'Native window pugl graphics backend')
@@ -348,7 +348,7 @@ if opengl_dep.found()
pkg.generate(gl_backend,
name: 'Pugl OpenGL',
filebase: 'pugl-gl-@0@'.format(major_version),
- subdirs: [name],
+ subdirs: [versioned_name],
version: meson.project_version(),
description: 'Pugl GUI library with OpenGL backend')
endif
@@ -376,7 +376,7 @@ if cairo_dep.found()
pkg.generate(cairo_backend,
name: 'Pugl Cairo',
filebase: 'pugl-cairo-@0@'.format(major_version),
- subdirs: [name],
+ subdirs: [versioned_name],
version: meson.project_version(),
description: 'Pugl GUI library with Cairo backend')
endif
@@ -414,13 +414,19 @@ if vulkan_dep.found()
pkg.generate(vulkan_backend,
name: 'Pugl Vulkan',
filebase: 'pugl-vulkan-@0@'.format(major_version),
- subdirs: [name],
+ subdirs: [versioned_name],
version: meson.project_version(),
description: 'Pugl GUI library with Vulkan backend')
endif
install_headers(c_headers, subdir: versioned_name / 'pugl')
-install_headers(cpp_headers, subdir: 'puglxx' + version_suffix)
+install_headers(cpp_headers, subdir: 'puglpp' + version_suffix / 'pugl')
+
+pkg.generate(name: 'Pugl++',
+ filebase: 'puglpp-@0@'.format(major_version),
+ subdirs: ['puglpp-@0@'.format(major_version)],
+ version: meson.project_version(),
+ description: 'Pugl GUI library C++ bindings')
if not get_option('docs').disabled()
subdir('doc')
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-22 06:55:48 +0000