build: move all games to a "games" subdirectory to clean up the root

directory layout mess.

Makefile.am

@@ -1,10 +1,5 @@
 
-SUBDIRS = src tutorial test tools gfx
-SUBDIRS += deushax
-SUBDIRS += monsterz
-SUBDIRS += mrpigeon
-SUBDIRS += orbital
-SUBDIRS += neercs
+SUBDIRS = src tutorial test tools games
 DIST_SUBDIRS = $(SUBDIRS) build binaries
 
 EXTRA_DIST = bootstrap TODO

build/vs2010/Lol.sln

@@ -1,17 +1,17 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "..\..\deushax\deushax.vcxproj", "{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "..\..\games\deushax\deushax.vcxproj", "{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monsterz", "..\..\monsterz\monsterz.vcxproj", "{17F0F184-4436-4D08-B8AA-16572EA238DB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monsterz", "..\..\games\monsterz\monsterz.vcxproj", "{17F0F184-4436-4D08-B8AA-16572EA238DB}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "..\..\deushax\editor.vcxproj", "{9C66B179-0737-4BDA-AB42-2ADE478A9008}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "..\..\games\deushax\editor.vcxproj", "{9C66B179-0737-4BDA-AB42-2ADE478A9008}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
 	EndProjectSection
@@ -58,7 +58,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "11_fractal", "..\..\tutoria
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MrPigeon", "MrPigeon", "{33704AA4-F2B5-4138-A40D-E3E77F89ED46}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrpigeon", "..\..\mrpigeon\mrpigeon.vcxproj", "{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrpigeon", "..\..\games\mrpigeon\mrpigeon.vcxproj", "{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
 	EndProjectSection
@@ -67,7 +67,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{1DFE1729
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Orbital", "Orbital", "{8C77EAA8-1077-4EF7-AE53-97C6C60A3601}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orbital", "..\..\orbital\orbital.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F40FECB52}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orbital", "..\..\games\orbital\orbital.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F40FECB52}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{1AFD580B-98B8-4689-B661-38C41132C60E}"
 	ProjectSection(SolutionItems) = preProject
@@ -78,7 +78,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{3D341D8A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Neercs", "Neercs", "{B357514A-7881-422D-8358-161B689E7620}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neercs", "..\..\neercs\neercs.vcxproj", "{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neercs", "..\..\tools\neercs\neercs.vcxproj", "{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

configure.ac

@@ -377,35 +377,36 @@ AC_SUBST(LOL_LIBS)
 AC_CONFIG_FILES(
  [Makefile
   src/Makefile
+  src/data/Makefile
+  src/data/font/Makefile
   tutorial/Makefile
   test/Makefile
   test/math/Makefile
   test/sandbox/Makefile
   test/xolotl/Makefile
-  gfx/Makefile
-  gfx/font/Makefile
-  tools/Makefile
   build/Makefile
   binaries/Makefile
+  games/Makefile
+  tools/Makefile
 ])
 AC_CONFIG_FILES(
- [monsterz/Makefile
+ [games/monsterz/Makefile
 ])
 AC_CONFIG_FILES(
- [deushax/Makefile
-  deushax/art/Makefile
-  deushax/art/test/Makefile
-  deushax/gfx/Makefile
-  deushax/maps/Makefile
+ [games/deushax/Makefile
+  games/deushax/art/Makefile
+  games/deushax/art/test/Makefile
+  games/deushax/gfx/Makefile
+  games/deushax/maps/Makefile
 ])
 AC_CONFIG_FILES(
- [mrpigeon/Makefile
+ [games/mrpigeon/Makefile
 ])
 AC_CONFIG_FILES(
- [orbital/Makefile
+ [games/orbital/Makefile
 ])
 AC_CONFIG_FILES(
- [neercs/Makefile
+ [tools/neercs/Makefile
 ])
 
 AC_OUTPUT

src/Makefile.am

@@ -1,4 +1,6 @@
 
+SUBDIRS = data
+
 noinst_LIBRARIES = liblol.a
 
 liblol_a_SOURCES = \

gfx/font/Makefile.am → src/data/font/Makefile.am

@@ -3,7 +3,7 @@ if USE_CACA
 all: ascii.png
 
 ascii.png:
-	../../tools/make-font | convert tga:- $@
+	../../../tools/make-font | convert tga:- $@
 
 #clean:
 #	rm -f ascii.png

src/debug/fps.cpp

@@ -44,12 +44,12 @@ DebugFps::DebugFps(int x, int y)
 #if 0
     for (int i = 0; i < 5; i ++)
     {
-        data->lines[i] = new Text(NULL, "gfx/font/ascii.png");
+        data->lines[i] = new Text(NULL, "src/gfx/font/ascii.png");
         data->lines[i]->SetPos(ivec3(x, y + (i ? 8 : 0) + 16 * i, 0));
         Ticker::Ref(data->lines[i]);
     }
 #else
-    data->lines[0] = new Text(NULL, "gfx/font/ascii.png");
+    data->lines[0] = new Text(NULL, "src/gfx/font/ascii.png");
     data->lines[0]->SetPos(ivec3(x, y, 100));
     Ticker::Ref(data->lines[0]);
 #endif

tools/Makefile.am

@@ -1,4 +1,8 @@
 
+SUBDIRS =
+SUBDIRS += neercs
+
+
 noinst_PROGRAMS = $(make_font)
 
 make_font_SOURCES = make-font.cpp

tutorial/11_fractal.cpp

@@ -140,15 +140,15 @@ public:
         }
 
 #if !defined __native_client__
-        m_centertext = new Text(NULL, "gfx/font/ascii.png");
+        m_centertext = new Text(NULL, "src/gfx/font/ascii.png");
         m_centertext->SetPos(ivec3(5, m_window_size.y - 15, 1));
         Ticker::Ref(m_centertext);
 
-        m_mousetext = new Text(NULL, "gfx/font/ascii.png");
+        m_mousetext = new Text(NULL, "src/gfx/font/ascii.png");
         m_mousetext->SetPos(ivec3(5, m_window_size.y - 29, 1));
         Ticker::Ref(m_mousetext);
 
-        m_zoomtext = new Text(NULL, "gfx/font/ascii.png");
+        m_zoomtext = new Text(NULL, "src/gfx/font/ascii.png");
         m_zoomtext->SetPos(ivec3(5, m_window_size.y - 43, 1));
         Ticker::Ref(m_zoomtext);
 #endif