Files are now in a src directory and I'm using a src/meson.build and tests/meson.build to specify what to build.

meson.build

@@ -85,95 +85,23 @@ dependencies += [
   sfml_window, lel_guecs
 ]
 
-sources = [
+inc_dirs = include_directories('src')
-  'ai.cpp',
-  'ai_debug.cpp',
-  'animation.cpp',
-  'autowalker.cpp',
-  'backend.cpp',
-  'battle.cpp',
-  'boss/fight.cpp',
-  'boss/system.cpp',
-  'boss/ui.cpp',
-  'camera.cpp',
-  'combat.cpp',
-  'components.cpp',
-  'config.cpp',
-  'dbc.cpp',
-  'game_level.cpp',
-  'goap.cpp',
-  'gui/combat_ui.cpp',
-  'gui/debug_ui.cpp',
-  'gui/dnd_loot.cpp',
-  'gui/event_router.cpp',
-  'gui/fsm.cpp',
-  'gui/guecstra.cpp',
-  'gui/loot_ui.cpp',
-  'gui/main_ui.cpp',
-  'gui/map_view.cpp',
-  'gui/mini_map.cpp',
-  'gui/overlay_ui.cpp',
-  'gui/ritual_ui.cpp',
-  'gui/status_ui.cpp',
-  'inventory.cpp',
-  'lights.cpp',
-  'map.cpp',
-  'matrix.cpp',
-  'maze.cpp',
-  'palette.cpp',
-  'pathing.cpp',
-  'rand.cpp',
-  'raycaster.cpp',
-  'rituals.cpp',
-  'scene.cpp',
-  'shaders.cpp',
-  'sound.cpp',
-  'spatialmap.cpp',
-  'stats.cpp',
-  'storyboard/ui.cpp',
-  'systems.cpp',
-  'textures.cpp',
-  'worldbuilder.cpp',
-  'easing.cpp',
-]
 
-executable('runtests', sources + [
+subdir('src')
-  'tests/ai.cpp',
+subdir('tests')
-  'tests/animation.cpp',
+
-  'tests/base.cpp',
+executable('runtests', sources + tests,
-  'tests/battle.cpp',
-  'tests/camera.cpp',
-  'tests/components.cpp',
-  'tests/config.cpp',
-  'tests/dbc.cpp',
-  'tests/dinkyecs.cpp',
-  'tests/event_router.cpp',
-  'tests/fsm.cpp',
-  'tests/inventory.cpp',
-  'tests/lighting.cpp',
-  'tests/loot.cpp',
-  'tests/map.cpp',
-  'tests/matrix.cpp',
-  'tests/mazes.cpp',
-  'tests/palette.cpp',
-  'tests/pathing.cpp',
-  'tests/rituals.cpp',
-  'tests/shaders.cpp',
-  'tests/sound.cpp',
-  'tests/spatialmap.cpp',
-  'tests/stats.cpp',
-  'tests/systems.cpp',
-  'tests/textures.cpp',
-  ],
   cpp_args: cpp_args,
   link_args: link_args,
+  include_directories: inc_dirs,
   override_options: exe_defaults,
   dependencies: dependencies + [catch2])
 
 executable('zedcaster',
-  sources + [ 'main.cpp' ],
+  sources + [ 'src/main.cpp' ],
   cpp_args: cpp_args,
   link_args: link_args,
+  include_directories: inc_dirs,
   override_options: exe_defaults,
   dependencies: dependencies)
 
@@ -181,6 +109,7 @@ executable('arena',
   sources + [ 'tools/arena.cpp' ],
   cpp_args: cpp_args,
   link_args: link_args,
+  include_directories: inc_dirs,
   override_options: exe_defaults,
   dependencies: dependencies)
 
@@ -188,6 +117,7 @@ executable('animator',
   sources + [ 'tools/animator.cpp' ],
   cpp_args: cpp_args,
   link_args: link_args,
+  include_directories: inc_dirs,
   override_options: exe_defaults,
   dependencies: dependencies)
 
@@ -195,20 +125,22 @@ executable('storyboard',
   sources + [ 'tools/storyboard.cpp' ],
   cpp_args: cpp_args,
   link_args: link_args,
+  include_directories: inc_dirs,
   override_options: exe_defaults,
   dependencies: dependencies)
 
 executable('icongen',
-  [ 'palette.cpp', 'textures.cpp', 'config.cpp', 'dbc.cpp', 'tools/icongen.cpp' ],
+  sources + [ 'tools/icongen.cpp' ],
   cpp_args: cpp_args,
   link_args: link_args,
+  include_directories: inc_dirs,
   override_options: exe_defaults,
   dependencies: dependencies)
 
 executable('fragviewer',
-  [ 'textures.cpp', 'config.cpp',
+  sources + [ 'tools/fragviewer.cpp' ],
-    'dbc.cpp', 'tools/fragviewer.cpp' ],
   cpp_args: cpp_args,
   link_args: link_args,
+  include_directories: inc_dirs,
   override_options: exe_defaults,
   dependencies: dependencies)

src/meson.build

@@ -0,0 +1,51 @@
+sources = files(
+  'ai.cpp',
+  'ai_debug.cpp',
+  'animation.cpp',
+  'autowalker.cpp',
+  'backend.cpp',
+  'battle.cpp',
+  'boss/fight.cpp',
+  'boss/system.cpp',
+  'boss/ui.cpp',
+  'camera.cpp',
+  'combat.cpp',
+  'components.cpp',
+  'config.cpp',
+  'dbc.cpp',
+  'game_level.cpp',
+  'goap.cpp',
+  'gui/combat_ui.cpp',
+  'gui/debug_ui.cpp',
+  'gui/dnd_loot.cpp',
+  'gui/event_router.cpp',
+  'gui/fsm.cpp',
+  'gui/guecstra.cpp',
+  'gui/loot_ui.cpp',
+  'gui/main_ui.cpp',
+  'gui/map_view.cpp',
+  'gui/mini_map.cpp',
+  'gui/overlay_ui.cpp',
+  'gui/ritual_ui.cpp',
+  'gui/status_ui.cpp',
+  'inventory.cpp',
+  'lights.cpp',
+  'map.cpp',
+  'matrix.cpp',
+  'maze.cpp',
+  'palette.cpp',
+  'pathing.cpp',
+  'rand.cpp',
+  'raycaster.cpp',
+  'rituals.cpp',
+  'scene.cpp',
+  'shaders.cpp',
+  'sound.cpp',
+  'spatialmap.cpp',
+  'stats.cpp',
+  'storyboard/ui.cpp',
+  'systems.cpp',
+  'textures.cpp',
+  'worldbuilder.cpp',
+  'easing.cpp',
+)