diff --git a/build/Lol (vs2015).sln b/build/Lol (vs2015).sln index 450a2d71..deab9d41 100644 --- a/build/Lol (vs2015).sln +++ b/build/Lol (vs2015).sln @@ -162,6 +162,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "weshgrow", "..\games\weshgr EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ld36", "..\people\sam\ld36\ld36.vcxproj", "{3832F5F6-CA2D-4367-9C69-B268A1F6B6C1}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "..\people\touky\shared\shared.vcxproj", "{EE203B88-44CF-4859-9D42-7A4F43FEDB52}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ORBIS = Debug|ORBIS @@ -699,6 +701,16 @@ Global {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 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|ORBIS.ActiveCfg = Debug|Win32 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|Win32.ActiveCfg = Debug|Win32 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|Win32.Build.0 = Debug|Win32 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|x64.ActiveCfg = Debug|x64 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|x64.Build.0 = Debug|x64 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|ORBIS.ActiveCfg = Release|Win32 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|Win32.ActiveCfg = Release|Win32 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|Win32.Build.0 = Release|Win32 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|x64.ActiveCfg = Release|x64 + {EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -776,5 +788,6 @@ Global {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} + {EE203B88-44CF-4859-9D42-7A4F43FEDB52} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772} EndGlobalSection EndGlobal diff --git a/src/bullet/lol-bullet.vcxproj b/src/bullet/lol-bullet.vcxproj index ab74aa0e..d2d20c62 100644 --- a/src/bullet/lol-bullet.vcxproj +++ b/src/bullet/lol-bullet.vcxproj @@ -154,134 +154,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -619,21 +491,23 @@ - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/lol-core.vcxproj b/src/lol-core.vcxproj index 67669d84..40ce3ada 100644 --- a/src/lol-core.vcxproj +++ b/src/lol-core.vcxproj @@ -277,8 +277,7 @@ - - + @@ -293,7 +292,6 @@ - @@ -303,7 +301,6 @@ - @@ -348,7 +345,6 @@ - diff --git a/src/lua/lol-lua.vcxproj b/src/lua/lol-lua.vcxproj index 63cdfe09..096d8728 100644 --- a/src/lua/lol-lua.vcxproj +++ b/src/lua/lol-lua.vcxproj @@ -108,7 +108,6 @@ -