From 549219c6f6092f52d2c42060d00356ef697eb8d2 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Wed, 15 Aug 2012 11:57:06 +0000 Subject: [PATCH] build: reorganise person stuff inside a people/ directory. --- Makefile.am | 3 ++- build/vs2010/Lol.sln | 4 ++-- configure.ac | 9 ++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index b8f62000..ec6e8e3f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,6 @@ -SUBDIRS = src tutorial test tools games +# Put "people" at the end because they're more likely to break builds. +SUBDIRS = src tutorial test tools games people DIST_SUBDIRS = $(SUBDIRS) build binaries EXTRA_DIST = bootstrap TODO diff --git a/build/vs2010/Lol.sln b/build/vs2010/Lol.sln index 88737253..9c8530f1 100644 --- a/build/vs2010/Lol.sln +++ b/build/vs2010/Lol.sln @@ -87,7 +87,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neercs", "..\..\tools\neerc EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Touky", "Touky", "{9EA99B18-D352-47F6-BC04-A0B49CAA2772}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToukyDemo", "..\..\games\ToukyDemo\ToukyDemo.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F43FECB52}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToukyDemo", "..\..\people\touky\ToukyDemo.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F43FECB52}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BtPhysTest", "..\..\test\BtPhysTest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}" EndProject @@ -95,7 +95,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "08_fbo", "..\..\tutorial\08 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Jnat", "Jnat", "{0A1651FC-322B-4B04-82CB-28E9046D9383}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo-jnat", "..\..\games\demo-jnat\demo-jnat.vcxproj", "{A69411B3-6DE8-404E-8E70-0D3375A7492A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo-jnat", "..\..\people\jnat\demo-jnat.vcxproj", "{A69411B3-6DE8-404E-8E70-0D3375A7492A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sam", "Sam", "{928A359C-9C41-400A-8D2D-A054B33A79F5}" EndProject diff --git a/configure.ac b/configure.ac index fb1f31c8..26381e72 100644 --- a/configure.ac +++ b/configure.ac @@ -472,6 +472,7 @@ AC_CONFIG_FILES( test/xolotl/Makefile build/Makefile binaries/Makefile + people/Makefile games/Makefile tools/Makefile ]) @@ -492,13 +493,11 @@ AC_CONFIG_FILES( [games/orbital/Makefile ]) AC_CONFIG_FILES( - [games/demo-jnat/Makefile -]) -AC_CONFIG_FILES( - [games/ToukyDemo/Makefile + [tools/neercs/Makefile ]) AC_CONFIG_FILES( - [tools/neercs/Makefile + [people/jnat/Makefile + people/touky/Makefile ]) AC_OUTPUT