[orbetto] Simplify orbetto source code

Auterion · Feb 2, 2024 · 615e37a · 615e37a
1 parent bdb586e
commit 615e37a
Show file tree

Hide file tree

Showing 5 changed files with 1,479 additions and 1,759 deletions.
diff --git a/ext/orbetto/meson.build b/ext/orbetto/meson.build
@@ -1,4 +1,4 @@
-project('orbetto', ['c', 'cpp'], default_options: ['cpp_std=c++20'])
+project('orbetto', ['c', 'cpp'], default_options: ['cpp_std=c++23'])
 
 # Clone the perfetto git repository
 subproject('perfetto')
@@ -18,12 +18,13 @@ perfbuf_lib = static_library('perfbuf', sources: perfbuf_sources, dependencies:
 # Clone the orbuculum git repository
 orbuculum = subproject('orbuculum')
 liborb = orbuculum.get_variable('liborb')
+orbinc = orbuculum.get_variable('incdirs')
 git_version_info_h = orbuculum.get_variable('git_version_info_h')
 
 # Compile and link everything together
 executable('orbetto',
-    sources: ['orbetto.cpp', git_version_info_h],
-    include_directories: ['subprojects/orbuculum/Inc', 'subprojects/orbuculum/Inc/external'] + perfbuf_lib.private_dir_include(),
+    sources: ['src/orbetto.cpp', 'src/device.cpp', git_version_info_h],
+    include_directories: ['src'] + perfbuf_lib.private_dir_include() + orbinc,
     dependencies: [dependency('protobuf')] + orbuculum.get_variable('dependencies'),
     link_with: [liborb, perfbuf_lib],
     install: true,