diff --git a/src/Externals/glbinding.vcxproj b/src/Externals/glbinding.vcxproj deleted file mode 100644 index 3350c23a185..00000000000 --- a/src/Externals/glbinding.vcxproj +++ /dev/null @@ -1,525 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6} - Win32Proj - Win32 - glbinding - - - - StaticLibrary - false - v140 - MultiByte - - - StaticLibrary - false - v140 - MultiByte - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - - - $(xrLibDir) - $(xrIntDir)$(ProjectName)\ - true - true - - - $(xrLibDir) - $(xrIntDir)$(ProjectName)\ - false - - - $(xrBinDir) - $(xrIntDir)$(ProjectName)\ - false - - - - /bigobj %(AdditionalOptions) - glbinding\source\glbinding\include;cmake\source;%(AdditionalIncludeDirectories) - Debug/ - EnableFastChecks - true - CompileAsCpp - ProgramDatabase - 4251;4267;4592 - Precise - true - Disabled - true - Disabled - NotUsing - MultiThreadedDLL - true - true - false - true - true - true - Level4 - GLBINDING_STATIC;STRINGS_BY_GL;%(PreprocessorDefinitions) - $(IntDir) - - - WIN32;_WINDOWS;_DEBUG;GLBINDING_STATIC;STRINGS_BY_GL;WIN32;UNICODE;_UNICODE;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - glbinding\source\glbinding\include;cmake\source;%(AdditionalIncludeDirectories) - - - glbinding\source\glbinding\include;cmake\source;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - /machine:X86 %(AdditionalOptions) - - - - - /bigobj %(AdditionalOptions) - glbinding\source\glbinding\include;cmake\source;%(AdditionalIncludeDirectories) - Release/ - false - CompileAsCpp - 4251;4267;4592 - Precise - true - AnySuitable - true - Full - NotUsing - MultiThreadedDLL - true - true - true - true - true - Level4 - true - GLBINDING_STATIC;STRINGS_BY_GL;%(PreprocessorDefinitions) - $(IntDir) - - - - - WIN32;_WINDOWS;NDEBUG;GLBINDING_STATIC;STRINGS_BY_GL;WIN32;UNICODE;_UNICODE;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - glbinding\source\glbinding\include;cmake\source;%(AdditionalIncludeDirectories) - - - glbinding\source\glbinding\include;cmake\source;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - /machine:X86 %(AdditionalOptions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Externals/lzo.vcxproj b/src/Externals/lzo.vcxproj new file mode 100644 index 00000000000..6d4237505ab --- /dev/null +++ b/src/Externals/lzo.vcxproj @@ -0,0 +1,211 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6} + Win32Proj + lzo + 8.1 + lzo2 + + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + lzo\src;lzo\include + MultiThreadedDLL + + + Windows + + + + + + + Level3 + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + lzo\src;lzo\include + + + Windows + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + lzo\src;lzo\include + + + Windows + true + true + + + + + Level3 + + + MaxSpeed + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + lzo\src;lzo\include + + + Windows + true + true + + + + + + \ No newline at end of file diff --git a/src/Externals/lzo.vcxproj.filters b/src/Externals/lzo.vcxproj.filters new file mode 100644 index 00000000000..b4c439635ac --- /dev/null +++ b/src/Externals/lzo.vcxproj.filters @@ -0,0 +1,220 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/engine.sln b/src/engine.sln index dc5c24e15eb..ac5af4f5a03 100644 --- a/src/engine.sln +++ b/src/engine.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}" EndProject @@ -166,6 +166,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameSpy", "Externals\GameSpy.vcxproj", "{67FF193E-2C20-402A-9026-9F5F6327503C}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lzo", "Externals\lzo.vcxproj", "{614AA57F-58D7-45A8-A5FF-93F04B05FAC6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_Dedicated|Mixed Platforms = Debug_Dedicated|Mixed Platforms @@ -1749,40 +1751,40 @@ Global {2C5AF8C8-96A6-45B2-860B-5E9C9911DDD6}.Release|Win32.ActiveCfg = Release|Win32 {2C5AF8C8-96A6-45B2-860B-5E9C9911DDD6}.Release|Win32.Build.0 = Release|Win32 {2C5AF8C8-96A6-45B2-860B-5E9C9911DDD6}.Release|x64.ActiveCfg = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Debug_Dedicated|Win32.Build.0 = Debug|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Debug_Dedicated|x64.ActiveCfg = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Debug_Dedicated|x64.Build.0 = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Debug|Win32.ActiveCfg = Debug|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Debug|Win32.Build.0 = Debug|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Debug|x64.ActiveCfg = Debug|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Mixed_Dedicated|Mixed Platforms.Build.0 = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Mixed_Dedicated|Win32.Build.0 = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Mixed_Dedicated|x64.ActiveCfg = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Mixed_Dedicated|x64.Build.0 = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Mixed|Mixed Platforms.ActiveCfg = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Mixed|Mixed Platforms.Build.0 = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Mixed|Win32.ActiveCfg = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Mixed|Win32.Build.0 = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Mixed|x64.ActiveCfg = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Mixed|x64.Build.0 = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Release_Dedicated|Win32.ActiveCfg = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Release_Dedicated|Win32.Build.0 = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Release_Dedicated|x64.ActiveCfg = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Release_Dedicated|x64.Build.0 = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Release|Mixed Platforms.Build.0 = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Release|Win32.ActiveCfg = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Release|Win32.Build.0 = Release|Win32 - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6}.Release|x64.ActiveCfg = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug_Dedicated|Win32.Build.0 = Debug|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug_Dedicated|x64.ActiveCfg = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug_Dedicated|x64.Build.0 = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.ActiveCfg = Debug|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.Build.0 = Debug|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.ActiveCfg = Debug|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed_Dedicated|Mixed Platforms.Build.0 = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed_Dedicated|Win32.Build.0 = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed_Dedicated|x64.ActiveCfg = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed_Dedicated|x64.Build.0 = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|Mixed Platforms.ActiveCfg = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|Mixed Platforms.Build.0 = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|Win32.ActiveCfg = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|Win32.Build.0 = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|x64.ActiveCfg = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|x64.Build.0 = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release_Dedicated|Win32.ActiveCfg = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release_Dedicated|Win32.Build.0 = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release_Dedicated|x64.ActiveCfg = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release_Dedicated|x64.Build.0 = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Mixed Platforms.Build.0 = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.ActiveCfg = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.Build.0 = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.ActiveCfg = Release|Win32 {CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32 {CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32 {CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Debug_Dedicated|Win32.Build.0 = Debug|Win32 @@ -2030,40 +2032,42 @@ Global {67FF193E-2C20-402A-9026-9F5F6327503C}.Release|Win32.ActiveCfg = Release|Win32 {67FF193E-2C20-402A-9026-9F5F6327503C}.Release|Win32.Build.0 = Release|Win32 {67FF193E-2C20-402A-9026-9F5F6327503C}.Release|x64.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug_Dedicated|Win32.Build.0 = Debug|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug_Dedicated|x64.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug_Dedicated|x64.Build.0 = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.ActiveCfg = Debug|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.Build.0 = Debug|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.ActiveCfg = Debug|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed_Dedicated|Mixed Platforms.Build.0 = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed_Dedicated|Win32.Build.0 = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed_Dedicated|x64.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed_Dedicated|x64.Build.0 = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|Mixed Platforms.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|Mixed Platforms.Build.0 = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|Win32.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|Win32.Build.0 = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|x64.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|x64.Build.0 = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release_Dedicated|Win32.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release_Dedicated|Win32.Build.0 = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release_Dedicated|x64.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release_Dedicated|x64.Build.0 = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Mixed Platforms.Build.0 = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.Build.0 = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.ActiveCfg = Release|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Debug_Dedicated|Win32.Build.0 = Debug|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Debug_Dedicated|x64.ActiveCfg = Debug|x64 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Debug_Dedicated|x64.Build.0 = Debug|x64 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Debug|Win32.ActiveCfg = Debug|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Debug|Win32.Build.0 = Debug|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Debug|x64.ActiveCfg = Debug|x64 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Debug|x64.Build.0 = Debug|x64 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Mixed_Dedicated|Mixed Platforms.Build.0 = Release|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Mixed_Dedicated|Win32.Build.0 = Release|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Mixed_Dedicated|x64.ActiveCfg = Release|x64 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Mixed_Dedicated|x64.Build.0 = Release|x64 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Mixed|Mixed Platforms.ActiveCfg = Release|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Mixed|Mixed Platforms.Build.0 = Release|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Mixed|Win32.ActiveCfg = Release|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Mixed|Win32.Build.0 = Release|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Mixed|x64.ActiveCfg = Release|x64 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Mixed|x64.Build.0 = Release|x64 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release_Dedicated|Win32.ActiveCfg = Release|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release_Dedicated|Win32.Build.0 = Release|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release_Dedicated|x64.ActiveCfg = Release|x64 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release_Dedicated|x64.Build.0 = Release|x64 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release|Mixed Platforms.Build.0 = Release|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release|Win32.ActiveCfg = Release|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release|Win32.Build.0 = Release|Win32 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release|x64.ActiveCfg = Release|x64 + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2106,7 +2110,7 @@ Global {CB449DB5-9C97-447A-AA25-35EA7712F62C} = {CB0C814D-FB4E-453B-B7A0-716F4A1EACA4} {55B0E2CA-E27A-47FC-BC92-21ABDC1044F5} = {CB0C814D-FB4E-453B-B7A0-716F4A1EACA4} {B90BDC22-A891-4B33-B562-29D701F65DBD} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B} - {AA714987-A9EB-3322-B3C6-EE1BD242CEC6} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348} + {664E6F0D-6784-4760-9565-D54F8EB1EDF4} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348} {CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348} {136857E3-D61B-4A03-A4E9-7F73ED946C41} = {CB0C814D-FB4E-453B-B7A0-716F4A1EACA4} {226C6807-BB48-4A07-BF13-806C38FD8FBE} = {CB0C814D-FB4E-453B-B7A0-716F4A1EACA4} @@ -2116,7 +2120,7 @@ Global {8E48F5C4-3EBB-4930-86AC-9AE6F26410FC} = {CB0C814D-FB4E-453B-B7A0-716F4A1EACA4} {1D137785-6E1B-4718-B800-F9380B945C9F} = {CB0C814D-FB4E-453B-B7A0-716F4A1EACA4} {67FF193E-2C20-402A-9026-9F5F6327503C} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348} - {664E6F0D-6784-4760-9565-D54F8EB1EDF4} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348} + {614AA57F-58D7-45A8-A5FF-93F04B05FAC6} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348} EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}