Move everything under the guecs/ directory in src/ so that it meshes better with other projects.

Makefile

@@ -10,7 +10,7 @@ endif
 %.cpp : %.rl
 	ragel -o $@ $<
 
-build: src/lel_parser.cpp
+build: src/guecs/lel_parser.cpp
 	meson compile -j 10 -C builddir
 
 release_build:

demos/calc.cpp

@@ -1,6 +1,6 @@
-#include "sfmlbackend/backend.hpp"
+#include "guecs/sfml/backend.hpp"
-#include "sfmlbackend/components.hpp"
+#include "guecs/sfml/components.hpp"
-#include "guecs.hpp"
+#include "guecs/ui.hpp"
 #include <fmt/xchar.h>
 #include <deque>
 

include/guecs/sfml/backend.hpp

@@ -1,4 +1,4 @@
-#include "guecs.hpp"
+#include "guecs/ui.hpp"
 
 namespace sfml {
   class Backend : public guecs::Backend {

include/guecs/sfml/components.hpp

@@ -1,8 +1,8 @@
 #pragma once
 #include <SFML/Graphics.hpp>
-#include "dbc.hpp"
+#include "guecs/dbc.hpp"
-#include "sfmlbackend/color.hpp"
+#include "guecs/sfml/color.hpp"
-#include "lel.hpp"
+#include "guecs/lel.hpp"
 #include <string>
 #include <memory>
 #include <functional>

include/guecs/ui.hpp

@@ -1,6 +1,6 @@
 #pragma once
-#include "dbc.hpp"
+#include "guecs/dbc.hpp"
-#include "lel.hpp"
+#include "guecs/lel.hpp"
 #include <string>
 #include <memory>
 #include <functional>
@@ -8,7 +8,7 @@
 #include <queue>
 #include <typeindex>
 #include <unordered_map>
-#include "sfmlbackend/components.hpp"
+#include "guecs/sfml/components.hpp"
 
 namespace guecs {
   using std::shared_ptr, std::wstring, std::string;

meson.build

@@ -70,18 +70,18 @@ dependencies += [
 
 
 sources = [
-  'src/dbc.cpp',
+  'src/guecs/dbc.cpp',
-  'src/guecs.cpp',
+  'src/guecs/ui.cpp',
-  'src/lel.cpp',
+  'src/guecs/lel.cpp',
-  'src/sfmlbackend/components.cpp',
+  'src/guecs/sfml/components.cpp',
 ]
 
 sfml_impl = [
-  'src/sfmlbackend/config.cpp',
+  'src/guecs/sfml/config.cpp',
-  'src/sfmlbackend/backend.cpp',
+  'src/guecs/sfml/backend.cpp',
-  'src/sfmlbackend/shaders.cpp',
+  'src/guecs/sfml/shaders.cpp',
-  'src/sfmlbackend/sound.cpp',
+  'src/guecs/sfml/sound.cpp',
-  'src/sfmlbackend/textures.cpp',
+  'src/guecs/sfml/textures.cpp',
 ]
 
 lel_guecs_inc = include_directories('include')

src/guecs/dbc.cpp

@@ -1,4 +1,4 @@
-#include "dbc.hpp"
+#include "guecs/dbc.hpp"
 #include <iostream>
 
 void dbc::log(const string &message, const std::source_location location) {

src/guecs/lel.cpp

@@ -1,9 +1,9 @@
-#include "lel.hpp"
+#include "guecs/lel.hpp"
 #include <fmt/core.h>
-#include "dbc.hpp"
+#include "guecs/dbc.hpp"
 #include <numeric>
 
-#include "lel_parser.cpp"
+#include "./lel_parser.cpp"
 
 namespace lel {
 

src/guecs/lel_parser.cpp

@@ -1,17 +1,17 @@
 
-#line 1 "lel_parser.rl"
+#line 1 ".\\src\\guecs\\lel_parser.rl"
-#include "lel.hpp"
+#include "guecs/lel.hpp"
 #include <fmt/core.h>
 #include <iostream>
 
 namespace lel {
 
 
-#line 41 "lel_parser.rl"
+#line 41 ".\\src\\guecs\\lel_parser.rl"
 
 
 
-#line 10 "lel_parser.cpp"
+#line 10 ".\\src\\guecs\\lel_parser.cpp"
 static const char _Parser_actions[] = {
 	0, 1, 1, 1, 2, 1, 3, 1, 
 	4, 1, 5, 1, 6, 1, 9, 1, 
@@ -84,7 +84,7 @@ static const int Parser_error = 0;
 static const int Parser_en_main = 1;
 
 
-#line 44 "lel_parser.rl"
+#line 44 ".\\src\\guecs\\lel_parser.rl"
 
 bool Parser::parse(std::string input) {
   reset();
@@ -96,14 +96,14 @@ bool Parser::parse(std::string input) {
   std::string tk;
 
   
-#line 91 "lel_parser.cpp"
+#line 91 ".\\src\\guecs\\lel_parser.cpp"
 	{
 	cs = Parser_start;
 	}
 
-#line 55 "lel_parser.rl"
+#line 55 ".\\src\\guecs\\lel_parser.rl"
   
-#line 94 "lel_parser.cpp"
+#line 94 ".\\src\\guecs\\lel_parser.cpp"
 	{
 	int _klen;
 	unsigned int _trans;
@@ -178,62 +178,62 @@ _match:
 		switch ( *_acts++ )
 		{
 	case 0:
-#line 11 "lel_parser.rl"
+#line 11 ".\\src\\guecs\\lel_parser.rl"
 	{tk = input.substr(start - begin, p - start); }
 	break;
 	case 1:
-#line 13 "lel_parser.rl"
+#line 13 ".\\src\\guecs\\lel_parser.rl"
 	{}
 	break;
 	case 2:
-#line 14 "lel_parser.rl"
+#line 14 ".\\src\\guecs\\lel_parser.rl"
 	{ grid.push_back(Row()); }
 	break;
 	case 3:
-#line 15 "lel_parser.rl"
+#line 15 ".\\src\\guecs\\lel_parser.rl"
 	{ cur.bottom = (*p) == '.'; }
 	break;
 	case 4:
-#line 16 "lel_parser.rl"
+#line 16 ".\\src\\guecs\\lel_parser.rl"
 	{ id(input.substr(start - begin, p - start)); }
 	break;
 	case 5:
-#line 17 "lel_parser.rl"
+#line 17 ".\\src\\guecs\\lel_parser.rl"
 	{ cur.col = 0; cur.row++; }
 	break;
 	case 6:
-#line 18 "lel_parser.rl"
+#line 18 ".\\src\\guecs\\lel_parser.rl"
 	{ cur.right = (*p) == '>'; }
 	break;
 	case 7:
-#line 19 "lel_parser.rl"
+#line 19 ".\\src\\guecs\\lel_parser.rl"
 	{cur.max_w = std::stoi(tk); }
 	break;
 	case 8:
-#line 20 "lel_parser.rl"
+#line 20 ".\\src\\guecs\\lel_parser.rl"
 	{ cur.max_h = std::stoi(tk); }
 	break;
 	case 9:
-#line 21 "lel_parser.rl"
+#line 21 ".\\src\\guecs\\lel_parser.rl"
 	{ cur.expand = true; }
 	break;
 	case 10:
-#line 22 "lel_parser.rl"
+#line 22 ".\\src\\guecs\\lel_parser.rl"
 	{ cur.center = true; }
 	break;
 	case 11:
-#line 23 "lel_parser.rl"
+#line 23 ".\\src\\guecs\\lel_parser.rl"
 	{ cur.percent = true; }
 	break;
 	case 12:
-#line 33 "lel_parser.rl"
+#line 33 ".\\src\\guecs\\lel_parser.rl"
 	{ start = p; }
 	break;
 	case 13:
-#line 36 "lel_parser.rl"
+#line 36 ".\\src\\guecs\\lel_parser.rl"
 	{start = p;}
 	break;
-#line 209 "lel_parser.cpp"
+#line 209 ".\\src\\guecs\\lel_parser.cpp"
 		}
 	}
 
@@ -246,7 +246,7 @@ _again:
 	_out: {}
 	}
 
-#line 56 "lel_parser.rl"
+#line 56 ".\\src\\guecs\\lel_parser.rl"
 
   bool good = pe - p == 0;
   if(good) {

src/guecs/lel_parser.rl

@@ -1,4 +1,4 @@
-#include "lel.hpp"
+#include "guecs/lel.hpp"
 #include <fmt/core.h>
 #include <iostream>
 

src/guecs/sfml/backend.cpp

@@ -1,7 +1,7 @@
-#include "sfmlbackend/backend.hpp"
+#include "guecs/sfml/backend.hpp"
-#include "sfmlbackend/shaders.hpp"
+#include "guecs/sfml/shaders.hpp"
-#include "sfmlbackend/sound.hpp"
+#include "guecs/sfml/sound.hpp"
-#include "sfmlbackend/textures.hpp"
+#include "guecs/sfml/textures.hpp"
 
 namespace sfml {
   guecs::SpriteTexture Backend::texture_get(const string& name) {

src/guecs/sfml/components.cpp

@@ -1,5 +1,5 @@
-#include "guecs.hpp"
+#include "guecs/ui.hpp"
-#include "sfmlbackend/backend.hpp"
+#include "guecs/sfml/backend.hpp"
 
 namespace guecs {
   static Backend* BACKEND = nullptr;

src/guecs/sfml/config.cpp

@@ -1,5 +1,5 @@
-#include "sfmlbackend/config.hpp"
+#include "guecs/sfml/config.hpp"
-#include "dbc.hpp"
+#include "guecs/dbc.hpp"
 #include <fmt/core.h>
 
 using nlohmann::json;

src/guecs/sfml/shaders.cpp

@@ -1,8 +1,8 @@
-#include "sfmlbackend/shaders.hpp"
+#include "guecs/sfml/shaders.hpp"
+#include "guecs/sfml/config.hpp"
+#include "guecs/dbc.hpp"
 #include <SFML/Graphics/Image.hpp>
-#include "dbc.hpp"
 #include <fmt/core.h>
-#include "sfmlbackend/config.hpp"
 #include <memory>
 
 namespace shaders {

src/guecs/sfml/sound.cpp

@@ -1,7 +1,7 @@
-#include "sfmlbackend/sound.hpp"
+#include "guecs/sfml/sound.hpp"
-#include "dbc.hpp"
+#include "guecs/sfml/config.hpp"
+#include "guecs/dbc.hpp"
 #include <fmt/core.h>
-#include "sfmlbackend/config.hpp"
 
 namespace sound {
   static SoundManager SMGR;

src/guecs/sfml/textures.cpp

@@ -1,8 +1,8 @@
-#include "sfmlbackend/textures.hpp"
+#include "guecs/dbc.hpp"
+#include "guecs/sfml/textures.hpp"
+#include "guecs/sfml/config.hpp"
 #include <SFML/Graphics/Image.hpp>
-#include "dbc.hpp"
 #include <fmt/core.h>
-#include "sfmlbackend/config.hpp"
 #include <memory>
 
 namespace textures {

src/guecs/ui.cpp

@@ -1,4 +1,4 @@
-#include "guecs.hpp"
+#include "guecs/ui.hpp"
 #include <typeinfo>
 
 namespace guecs {

tests/dbc.cpp

@@ -1,5 +1,5 @@
 #include <catch2/catch_test_macros.hpp>
-#include "dbc.hpp"
+#include "guecs/dbc.hpp"
 
 using namespace dbc;
 

tests/guecs.cpp

@@ -1,9 +1,10 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
-#include "guecs.hpp"
+#include "guecs/ui.hpp"
 #include <fmt/xchar.h>
 
 using namespace guecs;
 
 TEST_CASE("prototype one gui", "[ecs-gui]") {
+  // accidentally gutted, will recover later
 }

tests/lel.cpp

@@ -1,4 +1,4 @@
-#include "lel.hpp"
+#include "guecs/lel.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>

tests/shaders.cpp

@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "sfmlbackend/shaders.hpp"
+#include "guecs/sfml/shaders.hpp"
 
 using namespace fmt;
 

tests/sound.cpp

@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "sfmlbackend/sound.hpp"
+#include "guecs/sfml/sound.hpp"
 
 using namespace fmt;
 

tests/textures.cpp

@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <fmt/core.h>
 #include <string>
-#include "sfmlbackend/textures.hpp"
+#include "guecs/sfml/textures.hpp"
 
 using namespace fmt;