diff --git a/build/Lol (vs2015).sln b/build/Lol (vs2015).sln index 1663e54c..cdd7912c 100644 --- a/build/Lol (vs2015).sln +++ b/build/Lol (vs2015).sln @@ -116,8 +116,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Puzzle", "..\people\benlitz EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolui", "..\people\benlitz\lolui\lolui.vcxproj", "{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SinglShot", "SinglShot", "{50509BA3-D27B-4FAC-9772-9EC76146F709}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "singlshot", "..\games\singlshot\singlshot.vcxproj", "{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Jylam", "Jylam", "{454DE15C-9063-4EB1-AD6C-77D7150F15DF}" @@ -152,6 +150,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Zepto 8", "Zepto 8", "{66A8 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zepto8", "..\tools\zepto8\zepto8.vcxproj", "{28F5DE0F-B162-4833-8F61-A1AF782850A2}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ludum Dare", "Ludum Dare", "{0D4A4088-364A-4FC0-A1F5-10F0ED53A71D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "allturdbeast", "..\games\allturdbeast\allturdbeast.vcxproj", "{6CDB0A27-FE32-49E1-A079-5C9ACFF08420}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grunx", "..\games\grunx\grunx.vcxproj", "{775B46F7-03C4-4351-B78D-76088E028D14}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sot3000", "..\games\sot3000\sot3000.vcxproj", "{B9A255A0-2B92-4801-AF6C-354535A6E105}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "weshgrow", "..\games\weshgrow\weshgrow.vcxproj", "{010BF56B-2D3A-4EBE-839C-0B734EB368CA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ld36", "..\people\sam\ld36\ld36.vcxproj", "{3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ORBIS = Debug|ORBIS @@ -629,6 +639,66 @@ Global {28F5DE0F-B162-4833-8F61-A1AF782850A2}.Release|Win32.Build.0 = Release|Win32 {28F5DE0F-B162-4833-8F61-A1AF782850A2}.Release|x64.ActiveCfg = Release|x64 {28F5DE0F-B162-4833-8F61-A1AF782850A2}.Release|x64.Build.0 = Release|x64 + {6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Debug|ORBIS.ActiveCfg = Debug|ORBIS + {6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Debug|ORBIS.Build.0 = Debug|ORBIS + {6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Debug|Win32.ActiveCfg = Debug|Win32 + {6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Debug|Win32.Build.0 = Debug|Win32 + {6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Debug|x64.ActiveCfg = Debug|x64 + {6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Debug|x64.Build.0 = Debug|x64 + {6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Release|ORBIS.ActiveCfg = Release|ORBIS + {6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Release|ORBIS.Build.0 = Release|ORBIS + {6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Release|Win32.ActiveCfg = Release|Win32 + {6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Release|Win32.Build.0 = Release|Win32 + {6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Release|x64.ActiveCfg = Release|x64 + {6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Release|x64.Build.0 = Release|x64 + {775B46F7-03C4-4351-B78D-76088E028D14}.Debug|ORBIS.ActiveCfg = Debug|ORBIS + {775B46F7-03C4-4351-B78D-76088E028D14}.Debug|ORBIS.Build.0 = Debug|ORBIS + {775B46F7-03C4-4351-B78D-76088E028D14}.Debug|Win32.ActiveCfg = Debug|Win32 + {775B46F7-03C4-4351-B78D-76088E028D14}.Debug|Win32.Build.0 = Debug|Win32 + {775B46F7-03C4-4351-B78D-76088E028D14}.Debug|x64.ActiveCfg = Debug|x64 + {775B46F7-03C4-4351-B78D-76088E028D14}.Debug|x64.Build.0 = Debug|x64 + {775B46F7-03C4-4351-B78D-76088E028D14}.Release|ORBIS.ActiveCfg = Release|ORBIS + {775B46F7-03C4-4351-B78D-76088E028D14}.Release|ORBIS.Build.0 = Release|ORBIS + {775B46F7-03C4-4351-B78D-76088E028D14}.Release|Win32.ActiveCfg = Release|Win32 + {775B46F7-03C4-4351-B78D-76088E028D14}.Release|Win32.Build.0 = Release|Win32 + {775B46F7-03C4-4351-B78D-76088E028D14}.Release|x64.ActiveCfg = Release|x64 + {775B46F7-03C4-4351-B78D-76088E028D14}.Release|x64.Build.0 = Release|x64 + {B9A255A0-2B92-4801-AF6C-354535A6E105}.Debug|ORBIS.ActiveCfg = Debug|ORBIS + {B9A255A0-2B92-4801-AF6C-354535A6E105}.Debug|ORBIS.Build.0 = Debug|ORBIS + {B9A255A0-2B92-4801-AF6C-354535A6E105}.Debug|Win32.ActiveCfg = Debug|Win32 + {B9A255A0-2B92-4801-AF6C-354535A6E105}.Debug|Win32.Build.0 = Debug|Win32 + {B9A255A0-2B92-4801-AF6C-354535A6E105}.Debug|x64.ActiveCfg = Debug|x64 + {B9A255A0-2B92-4801-AF6C-354535A6E105}.Debug|x64.Build.0 = Debug|x64 + {B9A255A0-2B92-4801-AF6C-354535A6E105}.Release|ORBIS.ActiveCfg = Release|ORBIS + {B9A255A0-2B92-4801-AF6C-354535A6E105}.Release|ORBIS.Build.0 = Release|ORBIS + {B9A255A0-2B92-4801-AF6C-354535A6E105}.Release|Win32.ActiveCfg = Release|Win32 + {B9A255A0-2B92-4801-AF6C-354535A6E105}.Release|Win32.Build.0 = Release|Win32 + {B9A255A0-2B92-4801-AF6C-354535A6E105}.Release|x64.ActiveCfg = Release|x64 + {B9A255A0-2B92-4801-AF6C-354535A6E105}.Release|x64.Build.0 = Release|x64 + {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|ORBIS.ActiveCfg = Debug|ORBIS + {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|ORBIS.Build.0 = Debug|ORBIS + {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|Win32.ActiveCfg = Debug|Win32 + {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|Win32.Build.0 = Debug|Win32 + {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|x64.ActiveCfg = Debug|x64 + {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|x64.Build.0 = Debug|x64 + {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|ORBIS.ActiveCfg = Release|ORBIS + {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|ORBIS.Build.0 = Release|ORBIS + {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|Win32.ActiveCfg = Release|Win32 + {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|Win32.Build.0 = Release|Win32 + {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|x64.ActiveCfg = Release|x64 + {010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|x64.Build.0 = Release|x64 + {3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}.Debug|ORBIS.ActiveCfg = Debug|ORBIS + {3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}.Debug|ORBIS.Build.0 = Debug|ORBIS + {3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}.Debug|Win32.ActiveCfg = Debug|Win32 + {3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}.Debug|Win32.Build.0 = Debug|Win32 + {3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}.Debug|x64.ActiveCfg = Debug|x64 + {3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}.Debug|x64.Build.0 = Debug|x64 + {3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}.Release|ORBIS.ActiveCfg = Release|ORBIS + {3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}.Release|ORBIS.Build.0 = Release|ORBIS + {3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}.Release|Win32.ActiveCfg = Release|Win32 + {3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}.Release|Win32.Build.0 = Release|Win32 + {3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}.Release|x64.ActiveCfg = Release|x64 + {3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -684,8 +754,7 @@ Global {52493826-AC00-470B-A745-4F602529B3B0} = {B583BBFF-BE97-4F4E-BA1E-1F978A31EAB0} {9F291982-8C81-4105-BF39-16844648E55F} = {B583BBFF-BE97-4F4E-BA1E-1F978A31EAB0} {950EDCC1-DF6A-4A75-B083-DFE98E7DD34F} = {B583BBFF-BE97-4F4E-BA1E-1F978A31EAB0} - {50509BA3-D27B-4FAC-9772-9EC76146F709} = {1DFE1729-4F1B-47CA-9819-72431FE14E25} - {5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA} = {50509BA3-D27B-4FAC-9772-9EC76146F709} + {5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA} = {0D4A4088-364A-4FC0-A1F5-10F0ED53A71D} {454DE15C-9063-4EB1-AD6C-77D7150F15DF} = {5F1AAF03-7202-4C07-B99F-EB397105B1B7} {C3E2D690-F2B4-4A11-B317-D5CB8EF9561A} = {454DE15C-9063-4EB1-AD6C-77D7150F15DF} {EE203B88-44CF-4829-9D42-7A5F43FECB52} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772} @@ -701,5 +770,11 @@ Global {B6297FF2-63D0-41EE-BE13-EFF720C9B0FA} = {65FD48E9-C936-4A23-AD46-BF738B6D4733} {66A8679B-1D16-4BFA-B725-FDE85750E366} = {3D341D8A-E400-4B1D-BC05-B5C35487D9B5} {28F5DE0F-B162-4833-8F61-A1AF782850A2} = {66A8679B-1D16-4BFA-B725-FDE85750E366} + {0D4A4088-364A-4FC0-A1F5-10F0ED53A71D} = {1DFE1729-4F1B-47CA-9819-72431FE14E25} + {6CDB0A27-FE32-49E1-A079-5C9ACFF08420} = {0D4A4088-364A-4FC0-A1F5-10F0ED53A71D} + {775B46F7-03C4-4351-B78D-76088E028D14} = {0D4A4088-364A-4FC0-A1F5-10F0ED53A71D} + {B9A255A0-2B92-4801-AF6C-354535A6E105} = {0D4A4088-364A-4FC0-A1F5-10F0ED53A71D} + {010BF56B-2D3A-4EBE-839C-0B734EB368CA} = {0D4A4088-364A-4FC0-A1F5-10F0ED53A71D} + {3832F5F6-CA2D-4367-9C69-B268A1F6B6C1} = {0D4A4088-364A-4FC0-A1F5-10F0ED53A71D} EndGlobalSection EndGlobal diff --git a/configure.ac b/configure.ac index c6ea7582..4c8bf170 100644 --- a/configure.ac +++ b/configure.ac @@ -554,6 +554,7 @@ AC_CONFIG_FILES( people/jylam/private/oric_convert/Makefile people/sam/Makefile people/sam/kanagawa/Makefile + people/sam/ld36/Makefile people/sam/sapp/Makefile ])