diff --git a/resources/3rdparty/gtest-1.6.0/msvc/gtest.sln b/resources/3rdparty/gtest-1.6.0/msvc/gtest.sln index c1b292964..4b1f901fc 100644 --- a/resources/3rdparty/gtest-1.6.0/msvc/gtest.sln +++ b/resources/3rdparty/gtest-1.6.0/msvc/gtest.sln @@ -1,45 +1,55 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "gtest.vcproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "gtest.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "gtest_main.vcproj", "{3AF54C8A-10BF-4332-9147-F68ED9862032}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "gtest_main.vcxproj", "{3AF54C8A-10BF-4332-9147-F68ED9862032}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest", "gtest_unittest.vcproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest", "gtest_unittest.vcxproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test", "gtest_prod_test.vcproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test", "gtest_prod_test.vcxproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}" EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release.ActiveCfg = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release.Build.0 = Release|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug.ActiveCfg = Debug|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug.Build.0 = Debug|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release.ActiveCfg = Release|Win32 - {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release.Build.0 = Release|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug.ActiveCfg = Debug|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug.Build.0 = Debug|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release.ActiveCfg = Release|Win32 - {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release.Build.0 = Release|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug.ActiveCfg = Debug|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug.Build.0 = Debug|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release.ActiveCfg = Release|Win32 - {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release.Build.0 = Release|Win32 + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.ActiveCfg = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|Win32.Build.0 = Debug|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|x64.ActiveCfg = Debug|x64 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|x64.Build.0 = Debug|x64 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|Win32.ActiveCfg = Release|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|Win32.Build.0 = Release|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|x64.ActiveCfg = Release|x64 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|x64.Build.0 = Release|x64 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|Win32.ActiveCfg = Debug|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|Win32.Build.0 = Debug|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|x64.ActiveCfg = Debug|x64 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|x64.Build.0 = Debug|x64 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|Win32.ActiveCfg = Release|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|Win32.Build.0 = Release|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|x64.ActiveCfg = Release|x64 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|x64.Build.0 = Release|x64 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|Win32.ActiveCfg = Debug|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|Win32.Build.0 = Debug|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|x64.ActiveCfg = Debug|x64 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|x64.Build.0 = Debug|x64 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|Win32.ActiveCfg = Release|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|Win32.Build.0 = Release|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|x64.ActiveCfg = Release|x64 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|x64.Build.0 = Release|x64 EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/CLFSAppender.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/CLFSAppender.vcxproj index 4eef5648c..55e8aefa3 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/CLFSAppender.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/CLFSAppender.vcxproj @@ -44,44 +44,52 @@ false Unicode true + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte true + v110 DynamicLibrary false Unicode true + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte true + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/Qt4DebugAppender.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/Qt4DebugAppender.vcxproj index df5dbd0a1..7526eafcb 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/Qt4DebugAppender.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/Qt4DebugAppender.vcxproj @@ -44,44 +44,52 @@ false Unicode true + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte true + v110 DynamicLibrary false Unicode true + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte true + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/log4cplus.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/log4cplus.vcxproj index b16c88cb8..c9622918a 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/log4cplus.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/log4cplus.vcxproj @@ -44,44 +44,52 @@ false Unicode true + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte true + v110 DynamicLibrary false Unicode true + v110 DynamicLibrary false Unicode + v110 DynamicLibrary false MultiByte + v110 DynamicLibrary false MultiByte true + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/log4cplusS.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/log4cplusS.vcxproj index 5981bf5f3..e07c8d554 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/log4cplusS.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/log4cplusS.vcxproj @@ -43,41 +43,49 @@ StaticLibrary false Unicode + v110 StaticLibrary false MultiByte + v110 StaticLibrary false Unicode + v110 StaticLibrary false MultiByte + v110 StaticLibrary false Unicode + v110 StaticLibrary false MultiByte + v110 StaticLibrary false Unicode + v110 StaticLibrary false MultiByte + v110 @@ -653,11 +661,11 @@ true true true - true + false true true true - true + false @@ -1020,11 +1028,11 @@ true true true - true + false true true true - true + false diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/loggingserver.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/loggingserver.vcxproj index 6a935d741..865d4b55e 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/loggingserver.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/loggingserver.vcxproj @@ -43,43 +43,51 @@ Application false Unicode + v110 Application false Unicode true + v110 Application false MultiByte + v110 Application false MultiByte + v110 Application false Unicode + v110 Application false Unicode true + v110 Application false MultiByte + v110 Application false MultiByte + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/appender_test.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/appender_test.vcxproj index f54f060a2..4bfbe3dc0 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/appender_test.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/appender_test.vcxproj @@ -44,42 +44,50 @@ false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 Application false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/configandwatch_test.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/configandwatch_test.vcxproj index 53590fd46..7adfd61eb 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/configandwatch_test.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/configandwatch_test.vcxproj @@ -43,42 +43,50 @@ false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 Application false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/customloglevel_test.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/customloglevel_test.vcxproj index 74ecf725b..4fe2453da 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/customloglevel_test.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/customloglevel_test.vcxproj @@ -43,42 +43,50 @@ false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 Application false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/fileappender_test.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/fileappender_test.vcxproj index afb070ed0..8981df8a7 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/fileappender_test.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/fileappender_test.vcxproj @@ -43,42 +43,50 @@ false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 Application false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/filter_test.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/filter_test.vcxproj index 064bef005..42f59655c 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/filter_test.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/filter_test.vcxproj @@ -44,42 +44,50 @@ false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 Application false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/hierarchy_test.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/hierarchy_test.vcxproj index 033c62341..86e365ced 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/hierarchy_test.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/hierarchy_test.vcxproj @@ -43,42 +43,50 @@ false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 Application false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/loglog_test.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/loglog_test.vcxproj index a6d050035..6d63d4845 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/loglog_test.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/loglog_test.vcxproj @@ -43,42 +43,50 @@ false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 Application false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/ndc_test.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/ndc_test.vcxproj index 0bc97045c..2bf737120 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/ndc_test.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/ndc_test.vcxproj @@ -43,42 +43,50 @@ false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 Application false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/ostream_test.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/ostream_test.vcxproj index 87f395249..9ccf39d01 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/ostream_test.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/ostream_test.vcxproj @@ -43,42 +43,50 @@ false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 Application false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/patternlayout_test.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/patternlayout_test.vcxproj index 15733026b..6271b5af4 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/patternlayout_test.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/patternlayout_test.vcxproj @@ -44,42 +44,50 @@ false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 Application false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/performance_test.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/performance_test.vcxproj index f3bc9ab6d..1e186722e 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/performance_test.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/performance_test.vcxproj @@ -43,42 +43,50 @@ false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 Application false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/priority_test.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/priority_test.vcxproj index 62a4f19a4..7550b09b7 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/priority_test.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/priority_test.vcxproj @@ -43,42 +43,50 @@ false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 Application false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/socket_test.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/socket_test.vcxproj index 58d18019b..1a7707b4a 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/socket_test.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/socket_test.vcxproj @@ -43,42 +43,50 @@ false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 Application false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/thread_test.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/thread_test.vcxproj index 74e5c4621..1ff0c2c36 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/thread_test.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/thread_test.vcxproj @@ -43,42 +43,50 @@ false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 Application false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 diff --git a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/timeformat_test.vcxproj b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/timeformat_test.vcxproj index a9eb60877..cb2a1046a 100755 --- a/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/timeformat_test.vcxproj +++ b/resources/3rdparty/log4cplus-1.1.0/msvc10/tests/timeformat_test.vcxproj @@ -43,42 +43,50 @@ false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110 Application false Unicode true + v110 Application false Unicode + v110 Application false MultiByte + v110 Application false MultiByte + v110