Changeset 2801


Ignore:
Timestamp:
Jul 1, 2013, 4:46:11 PM (4 years ago)
Author:
sam
Message:

build: put tutorials and lol.js in a new "demos" directory.

Location:
trunk
Files:
2 added
3 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.am

    r2575 r2801  
    33
    44# Put "people" at the end because they're more likely to break builds.
    5 SUBDIRS = build src tutorial test tools games people doc
     5SUBDIRS = build src test tools games demos people doc
    66DIST_SUBDIRS = $(SUBDIRS) binaries
    77
  • trunk/build/vs2010/Lol.sln

    r2785 r2801  
    5151Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tutorial", "Tutorial", "{E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}"
    5252EndProject
    53 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01_triangle", "..\..\tutorial\01_triangle.vcxproj", "{B92ABADC-45BE-4CC5-B724-9426053123A1}"
     53Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01_triangle", "..\..\demos\tutorial\01_triangle.vcxproj", "{B92ABADC-45BE-4CC5-B724-9426053123A1}"
    5454        ProjectSection(ProjectDependencies) = postProject
    5555                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     
    5858        EndProjectSection
    5959EndProject
    60 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02_cube", "..\..\tutorial\02_cube.vcxproj", "{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}"
     60Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02_cube", "..\..\demos\tutorial\02_cube.vcxproj", "{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}"
    6161        ProjectSection(ProjectDependencies) = postProject
    6262                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     
    6565        EndProjectSection
    6666EndProject
    67 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05_easymesh", "..\..\tutorial\05_easymesh.vcxproj", "{1C5B8702-290C-42DA-AA9E-671348F5B747}"
     67Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05_easymesh", "..\..\demos\tutorial\05_easymesh.vcxproj", "{1C5B8702-290C-42DA-AA9E-671348F5B747}"
    6868        ProjectSection(ProjectDependencies) = postProject
    6969                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     
    7272        EndProjectSection
    7373EndProject
    74 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "11_fractal", "..\..\tutorial\11_fractal.vcxproj", "{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}"
     74Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "11_fractal", "..\..\demos\tutorial\11_fractal.vcxproj", "{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}"
    7575        ProjectSection(ProjectDependencies) = postProject
    7676                {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA}
     
    111111Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btphystest", "..\..\test\btphystest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}"
    112112EndProject
    113 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "08_fbo", "..\..\tutorial\08_fbo.vcxproj", "{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}"
     113Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "08_fbo", "..\..\demos\tutorial\08_fbo.vcxproj", "{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}"
    114114EndProject
    115115Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Jnat", "Jnat", "{0A1651FC-322B-4B04-82CB-28E9046D9383}"
     
    125125Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo-peeweek", "..\..\people\peeweek\private\demo-peeweek.vcxproj", "{C2E01551-B636-4324-8461-71811DF6FBB5}"
    126126EndProject
    127 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "03_noise", "..\..\tutorial\03_noise.vcxproj", "{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}"
     127Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "03_noise", "..\..\demos\tutorial\03_noise.vcxproj", "{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}"
    128128EndProject
    129129Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestProject", "..\..\people\jnat\TestProject\TestProject.vcxproj", "{5A77DCDD-2CBA-43E9-8B45-00C281443F77}"
     
    133133Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VsLol", "..\..\tools\vslol\VsLol.csproj", "{58922993-9830-4A40-B462-0326342F69ED}"
    134134EndProject
    135 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "04_texture", "..\..\tutorial\04_texture.vcxproj", "{834852DB-EDB6-4FD0-BCF9-45CD01126962}"
     135Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "04_texture", "..\..\demos\tutorial\04_texture.vcxproj", "{834852DB-EDB6-4FD0-BCF9-45CD01126962}"
    136136EndProject
    137137Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benlitz", "Benlitz", "{B583BBFF-BE97-4F4E-BA1E-1F978A31EAB0}"
     
    143143Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tactics", "..\..\people\touky\private\Tactics\tactics.vcxproj", "{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}"
    144144EndProject
    145 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "12_Voronoi", "..\..\tutorial\12_Voronoi.vcxproj", "{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}"
     145Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "12_Voronoi", "..\..\demos\tutorial\12_Voronoi.vcxproj", "{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}"
    146146EndProject
    147147Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "the_unfortunate_voronoid", "..\..\people\touky\private\the_unfortunate_voronoid\the_unfortunate_voronoid.vcxproj", "{6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}"
     
    149149Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lol.js", "Lol.js", "{430E9EC0-0E54-4BBB-BC31-3ECE04BAFCC5}"
    150150EndProject
    151 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lol.js", "..\..\people\sam\private\lol.js\lol.js.vcxproj", "{AA376B9B-484B-4DC4-982F-6CFA645E441E}"
     151Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lol.js", "..\..\demos\lol.js\lol.js.vcxproj", "{AA376B9B-484B-4DC4-982F-6CFA645E441E}"
    152152EndProject
    153153Global
  • trunk/configure.ac

    r2740 r2801  
    479479  src/data/Makefile
    480480  src/data/font/Makefile
    481   tutorial/Makefile
    482481  test/Makefile
    483482  test/math/Makefile
     
    488487  people/Makefile
    489488  games/Makefile
     489  demos/tutorial/Makefile
    490490  tools/Makefile
    491491  tools/vimlol/Makefile
     
    509509AC_CONFIG_FILES(
    510510 [games/orbital/Makefile
     511])
     512AC_CONFIG_FILES(
     513 [demos/tutorial/Makefile
     514  demos/lol.js/Makefile
    511515])
    512516AC_CONFIG_FILES(
     
    530534  people/sam/private/Makefile
    531535  people/sam/private/kanagawa/Makefile
    532   people/sam/private/lol.js/Makefile
    533536  people/sam/private/sapp/Makefile
    534537])
Note: See TracChangeset for help on using the changeset viewer.