Index: src/libchcore/libchcore.vc120.vcxproj =================================================================== diff -u -r7770d9e0a316d014b75ea4bd88f8b6d13c80c318 -rb712554e2b3602ce7242c7ff1cd7745b03378440 --- src/libchcore/libchcore.vc120.vcxproj (.../libchcore.vc120.vcxproj) (revision 7770d9e0a316d014b75ea4bd88f8b6d13c80c318) +++ src/libchcore/libchcore.vc120.vcxproj (.../libchcore.vc120.vcxproj) (revision b712554e2b3602ce7242c7ff1cd7745b03378440) @@ -17,6 +17,22 @@ Release x64 + + Testing Debug + Win32 + + + Testing Debug + x64 + + + Testing Release + Win32 + + + Testing Release + x64 + libchcore @@ -31,37 +47,71 @@ Unicode true + + DynamicLibrary + v120 + Unicode + true + DynamicLibrary v120 Unicode + + DynamicLibrary + v120 + Unicode + DynamicLibrary Unicode true v120 + + DynamicLibrary + Unicode + true + v120 + DynamicLibrary Unicode v120 + + DynamicLibrary + Unicode + v120 + + + + + + + + + + + + + <_ProjectFileVersion>11.0.51106.1 @@ -74,6 +124,14 @@ C:\dev\boost_1_56_0;$(IncludePath) C:\dev\boost_1_56_0\lib-12.0\x32\lib;$(LibraryPath) + + $(SolutionDir)bin-vc120\$(Configuration)\ + $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ + true + $(ProjectName)32ud + C:\dev\boost_1_56_0;$(IncludePath) + C:\dev\boost_1_56_0\lib-12.0\x32\lib;$(LibraryPath) + $(SolutionDir)bin-vc120\$(Configuration)\ $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ @@ -84,6 +142,16 @@ C:\dev\boost_1_56_0;$(IncludePath) C:\dev\boost_1_56_0\lib-12.0\x64\lib;$(LibraryPath) + + $(SolutionDir)bin-vc120\$(Configuration)\ + $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ + true + $(ProjectName)64ud + NativeRecommendedRules.ruleset + false + C:\dev\boost_1_56_0;$(IncludePath) + C:\dev\boost_1_56_0\lib-12.0\x64\lib;$(LibraryPath) + $(SolutionDir)bin-vc120\$(Configuration)\ $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ @@ -92,6 +160,14 @@ C:\dev\boost_1_56_0;$(IncludePath) C:\dev\boost_1_56_0\lib-12.0\x32\lib;$(LibraryPath) + + $(SolutionDir)bin-vc120\$(Configuration)\ + $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ + false + $(ProjectName)32u + C:\dev\boost_1_56_0;$(IncludePath) + C:\dev\boost_1_56_0\lib-12.0\x32\lib;$(LibraryPath) + $(SolutionDir)bin-vc120\$(Configuration)\ $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ @@ -100,6 +176,14 @@ C:\dev\boost_1_56_0;$(IncludePath) C:\dev\boost_1_56_0\lib-12.0\x64\lib;$(LibraryPath) + + $(SolutionDir)bin-vc120\$(Configuration)\ + $(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\ + false + $(ProjectName)64u + C:\dev\boost_1_56_0;$(IncludePath) + C:\dev\boost_1_56_0\lib-12.0\x64\lib;$(LibraryPath) + Disabled @@ -119,8 +203,61 @@ true Windows MachineX86 + "$(OutDir)" + + + Disabled + _SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCHCORE_EXPORTS;_BIND_TO_CURRENT_VCLIBS_VERSION=1;NOMINMAX;TESTING;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + $(IntDir)$(TargetName)_vs90.pdb + Level4 + true + EditAndContinue + true + ..\..\ext\gmock\include;../../ext + + + true + Windows + MachineX86 + gmock32d.lib;%(AdditionalDependencies) + "$(OutDir)" + + + cd "$(TargetDir)" + +if "$(PlatformName)" EQU "x64" goto x64 + +if "$(Configuration)" EQU "Testing Release" goto x32rel + +:x32dbg +"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" +goto end + +:x32rel +"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" +goto end + +:x64 +if "$(Configuration)" EQU "Testing Release" goto x64rel + +:x64dbg +"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" +goto end + +:x64rel +"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" +goto end + +:end + + + X64 @@ -145,8 +282,66 @@ true Windows MachineX64 + "$(OutDir)" + + + X64 + + + Disabled + _SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCHCORE_EXPORTS;_BIND_TO_CURRENT_VCLIBS_VERSION=1;NOMINMAX;TESTING;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + $(IntDir)$(TargetName)_vs90.pdb + Level4 + false + ProgramDatabase + 4996 + false + true + ..\..\ext\gmock\include;../../ext + + + true + Windows + MachineX64 + gmock64d.lib;%(AdditionalDependencies) + "$(OutDir)" + + + cd "$(TargetDir)" + +if "$(PlatformName)" EQU "x64" goto x64 + +if "$(Configuration)" EQU "Testing Release" goto x32rel + +:x32dbg +"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" +goto end + +:x32rel +"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" +goto end + +:x64 +if "$(Configuration)" EQU "Testing Release" goto x64rel + +:x64dbg +"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" +goto end + +:x64rel +"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" +goto end + +:end + + + MaxSpeed @@ -168,8 +363,63 @@ true true MachineX86 + "$(OutDir)" + + + MaxSpeed + true + _SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCHCORE_EXPORTS;_BIND_TO_CURRENT_VCLIBS_VERSION=1;NOMINMAX;TESTING;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Use + $(IntDir)$(TargetName)_vs90.pdb + Level4 + true + ProgramDatabase + true + ..\..\ext\gmock\include;../../ext + + + true + Windows + true + true + MachineX86 + gmock32.lib;%(AdditionalDependencies) + "$(OutDir)" + + + cd "$(TargetDir)" + +if "$(PlatformName)" EQU "x64" goto x64 + +if "$(Configuration)" EQU "Testing Release" goto x32rel + +:x32dbg +"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" +goto end + +:x32rel +"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" +goto end + +:x64 +if "$(Configuration)" EQU "Testing Release" goto x64rel + +:x64dbg +"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" +goto end + +:x64rel +"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" +goto end + +:end + + + X64 @@ -194,9 +444,69 @@ true true MachineX64 + "$(OutDir)" + + + X64 + + + MaxSpeed + true + _SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCHCORE_EXPORTS;_BIND_TO_CURRENT_VCLIBS_VERSION=1;NOMINMAX;TESTING;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Use + $(IntDir)$(TargetName)_vs90.pdb + Level4 + true + ProgramDatabase + true + ..\..\ext\gmock\include;../../ext + + + true + Windows + true + true + MachineX64 + gmock64.lib;%(AdditionalDependencies) + "$(OutDir)" + + + cd "$(TargetDir)" + +if "$(PlatformName)" EQU "x64" goto x64 + +if "$(Configuration)" EQU "Testing Release" goto x32rel + +:x32dbg +"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" +goto end + +:x32rel +"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" +goto end + +:x64 +if "$(Configuration)" EQU "Testing Release" goto x64rel + +:x64dbg +"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" +goto end + +:x64rel +"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" +goto end + +:end + + + + + @@ -211,10 +521,13 @@ - + + + + @@ -244,6 +557,7 @@ + @@ -282,6 +596,22 @@ + + true + true + true + true + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + @@ -293,9 +623,60 @@ - + + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + @@ -324,6 +705,7 @@ + @@ -356,23 +738,39 @@ + + false + false + + false + false + + false + false + + false + false Create + Create Create + Create Create + Create Create + Create @@ -383,9 +781,6 @@ {5510b933-046f-4f75-8b46-5e8279c8ccde} - - -