Code reorg.

Makefile

@@ -13,7 +13,7 @@ endif
 %.cpp : %.rl
 	ragel -o $@ $<
 
-build: $(ROOT_DIR)/md_parser.cpp
+build: $(ROOT_DIR)/src/md_parser.cpp
 	meson compile -j 10 -C $(ROOT_DIR)/builddir
 
 release_build:
@@ -26,8 +26,8 @@ debug_build:
 
 run: build
 ifeq '$(OS)' 'Windows_NT'
-	powershell "cp ./builddir/besos.exe ."
+	powershell "cp ./builddir/bezos.exe ."
-	./besos ${SAMPLE}
+	./bezos ${SAMPLE}
 else
 	./builddir/besos ${SAMPLE}
 endif

meson.build

@@ -79,25 +79,28 @@ dependencies += [
   sfml_window, lel_guecs, lel_guecs_sfml
 ]
 
+
 sources = [
-  'dbc.cpp',
+  'src/dbc.cpp',
-  'control_ui.cpp',
+  'src/control_ui.cpp',
-  'slides_ui.cpp',
+  'src/slides_ui.cpp',
-  'parser.cpp',
+  'src/parser.cpp',
 ]
 
 tests = [
   'tests/parsing.cpp'
 ]
 
-executable('bezos', sources + ['main.cpp'],
+executable('bezos', sources + ['src/main.cpp'],
   cpp_args: cpp_args,
   link_args: link_args,
+  include_directories: include_directories('src'),
   override_options: exe_defaults,
   dependencies: dependencies)
 
 executable('runtests', sources + tests,
   cpp_args: cpp_args,
   link_args: link_args,
+  include_directories: include_directories('src'),
   override_options: exe_defaults,
   dependencies: dependencies + [catch2])

src/main.cpp

@@ -8,7 +8,7 @@
 #include "parser.hpp"
 
 int main(int argc, char *argv[]) {
-  dbc::check(argc >= 2, "USAGE: besos my_fucking_slides.md");
+  dbc::check(argc >= 2, "USAGE: bezos my_fucking_slides.md");
 
   sfml::Backend backend;
   guecs::init(&backend);

src/slides_ui.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "guecs/sfml/backend.hpp"
 #include "guecs/sfml/components.hpp"
 #include "guecs/ui.hpp"
 #include <nlohmann/json.hpp>

wraps/lel-guecs.wrap

@@ -1,5 +1,5 @@
 [wrap-git]
-directory=lel-guecs-0.6.0
+directory=lel-guecs-0.7.0
 url=https://git.learnjsthehardway.com/learn-code-the-hard-way/lel-guecs.git
 revision=HEAD
 depth=1