Minor folder restructuring and support for extra benchmarks.

Author: KaruroChori

meson.build

@@ -24,26 +24,7 @@ frozen_dep = dependency('frozen')
 ff_dep = dependency('fast_float')
 natsort_dep = dependency('natsort')
 
-vs_templ_lib = library(
-  'vs-templ',
-  [
-    'src/vs-templ.cpp',
-    'src/utils.cpp',
-    'src/stack-lang.cpp',
-  ],
-  dependencies: [pugixml_dep, frozen_dep, ff_dep, natsort_dep],
-  include_directories: ['include'],
-  install: not meson.is_subproject(),
-)
-
-vs_templ_cli = executable(
-  'vs.templ',
-  ['src/app/main.cpp'],
-  dependencies: [pugixml_dep],
-  link_with: [vs_templ_lib],
-  include_directories: ['include'],
-  install: not meson.is_subproject(),
-)
+subdir(['./src/'])
 
 pandoc = find_program('pandoc', required: false)
 if pandoc.found()
@@ -77,6 +58,10 @@ if get_option('tests')
   subdir(['./test/'])
 endif
 
+if get_option('benchmarks')
+  subdir(['./benchmark/'])
+endif
+
 subdir(['./metadata/'])
 
 pconf = import('pkgconfig')

meson.options

@@ -1 +1,2 @@
-option('tests', type: 'boolean', value: true)
+option('tests', type: 'boolean', value: true)
+option('benchmarks', type: 'boolean', value: false)

old/codegen.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 # Not used for now.
-gperf ./schemas/vm.gperf --output-file ./src/vm.autogen.cpp
+gperf ./schemas/vm.gperf --output-file ./src/lib/vm.autogen.cpp

src/app/main.cpp src/cli/main.cppsrc/app/main.cpp renamed to src/cli/main.cpp

@@ -0,0 +1,20 @@
+vs_templ_lib = library(
+  'vs-templ',
+  [
+    'lib/vs-templ.cpp',
+    'lib/utils.cpp',
+    'lib/stack-lang.cpp',
+  ],
+  dependencies: [pugixml_dep, frozen_dep, ff_dep, natsort_dep],
+  include_directories: ['../include'],
+  install: not meson.is_subproject(),
+)
+
+vs_templ_cli = executable(
+  'vs.templ',
+  ['app/main.cpp'],
+  dependencies: [pugixml_dep],
+  link_with: [vs_templ_lib],
+  include_directories: ['../include'],
+  install: not meson.is_subproject(),
+)