Changeset 1524


Ignore:
Timestamp:
Jun 25, 2012, 4:15:07 PM (7 years ago)
Author:
sam
Message:

build: move all games to a "games" subdirectory to clean up the root
directory layout mess.

Location:
trunk
Files:
2 added
10 edited
6 moved

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.am

    r1520 r1524  
    11
    2 SUBDIRS = src tutorial test tools gfx
    3 SUBDIRS += deushax
    4 SUBDIRS += monsterz
    5 SUBDIRS += mrpigeon
    6 SUBDIRS += orbital
    7 SUBDIRS += neercs
     2SUBDIRS = src tutorial test tools games
    83DIST_SUBDIRS = $(SUBDIRS) build binaries
    94
  • trunk/binaries

    • Property svn:ignore set to
      .deps
      Makefile
      Makefile.in
  • trunk/build

    • Property svn:ignore set to
      .deps
      Makefile
      Makefile.in
  • trunk/build/vs2010/Lol.sln

    r1518 r1524  
    22Microsoft Visual Studio Solution File, Format Version 11.00
    33# Visual Studio 2010
    4 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "..\..\deushax\deushax.vcxproj", "{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}"
    5         ProjectSection(ProjectDependencies) = postProject
    6                 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    7         EndProjectSection
    8 EndProject
    9 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monsterz", "..\..\monsterz\monsterz.vcxproj", "{17F0F184-4436-4D08-B8AA-16572EA238DB}"
    10         ProjectSection(ProjectDependencies) = postProject
    11                 {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
    12         EndProjectSection
    13 EndProject
    14 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "..\..\deushax\editor.vcxproj", "{9C66B179-0737-4BDA-AB42-2ADE478A9008}"
     4Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "..\..\games\deushax\deushax.vcxproj", "{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}"
     5        ProjectSection(ProjectDependencies) = postProject
     6                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     7        EndProjectSection
     8EndProject
     9Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monsterz", "..\..\games\monsterz\monsterz.vcxproj", "{17F0F184-4436-4D08-B8AA-16572EA238DB}"
     10        ProjectSection(ProjectDependencies) = postProject
     11                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     12        EndProjectSection
     13EndProject
     14Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "..\..\games\deushax\editor.vcxproj", "{9C66B179-0737-4BDA-AB42-2ADE478A9008}"
    1515        ProjectSection(ProjectDependencies) = postProject
    1616                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     
    5959Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MrPigeon", "MrPigeon", "{33704AA4-F2B5-4138-A40D-E3E77F89ED46}"
    6060EndProject
    61 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrpigeon", "..\..\mrpigeon\mrpigeon.vcxproj", "{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}"
     61Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrpigeon", "..\..\games\mrpigeon\mrpigeon.vcxproj", "{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}"
    6262        ProjectSection(ProjectDependencies) = postProject
    6363                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     
    6868Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Orbital", "Orbital", "{8C77EAA8-1077-4EF7-AE53-97C6C60A3601}"
    6969EndProject
    70 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orbital", "..\..\orbital\orbital.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F40FECB52}"
     70Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orbital", "..\..\games\orbital\orbital.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F40FECB52}"
    7171EndProject
    7272Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{1AFD580B-98B8-4689-B661-38C41132C60E}"
     
    7979Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Neercs", "Neercs", "{B357514A-7881-422D-8358-161B689E7620}"
    8080EndProject
    81 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neercs", "..\..\neercs\neercs.vcxproj", "{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}"
     81Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neercs", "..\..\tools\neercs\neercs.vcxproj", "{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}"
    8282EndProject
    8383Global
  • trunk/configure.ac

    r1520 r1524  
    378378 [Makefile
    379379  src/Makefile
     380  src/data/Makefile
     381  src/data/font/Makefile
    380382  tutorial/Makefile
    381383  test/Makefile
     
    383385  test/sandbox/Makefile
    384386  test/xolotl/Makefile
    385   gfx/Makefile
    386   gfx/font/Makefile
    387   tools/Makefile
    388387  build/Makefile
    389388  binaries/Makefile
    390 ])
    391 AC_CONFIG_FILES(
    392  [monsterz/Makefile
    393 ])
    394 AC_CONFIG_FILES(
    395  [deushax/Makefile
    396   deushax/art/Makefile
    397   deushax/art/test/Makefile
    398   deushax/gfx/Makefile
    399   deushax/maps/Makefile
    400 ])
    401 AC_CONFIG_FILES(
    402  [mrpigeon/Makefile
    403 ])
    404 AC_CONFIG_FILES(
    405  [orbital/Makefile
    406 ])
    407 AC_CONFIG_FILES(
    408  [neercs/Makefile
     389  games/Makefile
     390  tools/Makefile
     391])
     392AC_CONFIG_FILES(
     393 [games/monsterz/Makefile
     394])
     395AC_CONFIG_FILES(
     396 [games/deushax/Makefile
     397  games/deushax/art/Makefile
     398  games/deushax/art/test/Makefile
     399  games/deushax/gfx/Makefile
     400  games/deushax/maps/Makefile
     401])
     402AC_CONFIG_FILES(
     403 [games/mrpigeon/Makefile
     404])
     405AC_CONFIG_FILES(
     406 [games/orbital/Makefile
     407])
     408AC_CONFIG_FILES(
     409 [tools/neercs/Makefile
    409410])
    410411
  • trunk/src/Makefile.am

    r1513 r1524  
     1
     2SUBDIRS = data
    13
    24noinst_LIBRARIES = liblol.a
  • trunk/src/data/font/Makefile.am

    r1152 r1524  
    44
    55ascii.png:
    6         ../../tools/make-font | convert tga:- $@
     6        ../../../tools/make-font | convert tga:- $@
    77
    88#clean:
  • trunk/src/debug/fps.cpp

    r1310 r1524  
    4545    for (int i = 0; i < 5; i ++)
    4646    {
    47         data->lines[i] = new Text(NULL, "gfx/font/ascii.png");
     47        data->lines[i] = new Text(NULL, "src/gfx/font/ascii.png");
    4848        data->lines[i]->SetPos(ivec3(x, y + (i ? 8 : 0) + 16 * i, 0));
    4949        Ticker::Ref(data->lines[i]);
    5050    }
    5151#else
    52     data->lines[0] = new Text(NULL, "gfx/font/ascii.png");
     52    data->lines[0] = new Text(NULL, "src/gfx/font/ascii.png");
    5353    data->lines[0]->SetPos(ivec3(x, y, 100));
    5454    Ticker::Ref(data->lines[0]);
  • trunk/tools/Makefile.am

    r631 r1524  
     1
     2SUBDIRS =
     3SUBDIRS += neercs
     4
    15
    26noinst_PROGRAMS = $(make_font)
  • trunk/tutorial/11_fractal.cpp

    r1518 r1524  
    141141
    142142#if !defined __native_client__
    143         m_centertext = new Text(NULL, "gfx/font/ascii.png");
     143        m_centertext = new Text(NULL, "src/gfx/font/ascii.png");
    144144        m_centertext->SetPos(ivec3(5, m_window_size.y - 15, 1));
    145145        Ticker::Ref(m_centertext);
    146146
    147         m_mousetext = new Text(NULL, "gfx/font/ascii.png");
     147        m_mousetext = new Text(NULL, "src/gfx/font/ascii.png");
    148148        m_mousetext->SetPos(ivec3(5, m_window_size.y - 29, 1));
    149149        Ticker::Ref(m_mousetext);
    150150
    151         m_zoomtext = new Text(NULL, "gfx/font/ascii.png");
     151        m_zoomtext = new Text(NULL, "src/gfx/font/ascii.png");
    152152        m_zoomtext->SetPos(ivec3(5, m_window_size.y - 43, 1));
    153153        Ticker::Ref(m_zoomtext);
Note: See TracChangeset for help on using the changeset viewer.