diff --git a/CppUTest.vcxproj b/CppUTest.vcxproj
index 16e718e85..a2d6ad4f5 100644
--- a/CppUTest.vcxproj
+++ b/CppUTest.vcxproj
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{F468F539-27BD-468E-BE64-DDE641400B51}
@@ -19,11 +27,21 @@
false
MultiByte
+
+ StaticLibrary
+ false
+ MultiByte
+
StaticLibrary
false
MultiByte
+
+ StaticLibrary
+ false
+ MultiByte
+
@@ -31,18 +49,31 @@
+
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.30319.1
lib\
+ lib\
cpputest_build\Debug\$(ProjectName)\
+ cpputest_build\Debug\$(ProjectName)\
lib\
+ lib\
cpputest_build\Release\$(ProjectName)\
+ cpputest_build\Release\$(ProjectName)\
$(ProjectName)d
+ $(ProjectName)d
@@ -76,6 +107,38 @@
true
+
+
+ Disabled
+ .\include;.\include\Platforms\VisualCpp;%(AdditionalIncludeDirectories)
+ _LIB;WIN32;_DEBUG;STDC_WANT_SECURE_LIB;CPPUTEST_USE_LONG_LONG;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ Level3
+ true
+ ProgramDatabase
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ winmm.lib;%(AdditionalDependencies)
+
+
+ true
+ .\Debug/CppUTestd.bsc
+
+
+
+
+
+
+
+ true
+
+
Disabled
@@ -110,6 +173,40 @@
true
+
+
+ Disabled
+ .\include;.\include\Platforms\VisualCpp;%(AdditionalIncludeDirectories)
+ OnlyExplicitInline
+ WIN32;NDEBUG;_LIB;STDC_WANT_SECURE_LIB;CPPUTEST_USE_LONG_LONG;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+ Level3
+ true
+ OldStyle
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ winmm.lib;%(AdditionalDependencies)
+
+
+ true
+ .\Release/CppUTest.bsc
+
+
+
+
+
+
+
+ true
+
+
@@ -145,8 +242,11 @@
%(AdditionalIncludeDirectories)
+ %(AdditionalIncludeDirectories)
%(PreprocessorDefinitions)
+ %(PreprocessorDefinitions)
%(PreprocessorDefinitions)
+ %(PreprocessorDefinitions)
diff --git a/CppUTest_VS201x.sln b/CppUTest_VS201x.sln
index 12db37f5f..d794568ba 100644
--- a/CppUTest_VS201x.sln
+++ b/CppUTest_VS201x.sln
@@ -8,17 +8,27 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{913088F6-37C0-4195-80E9-548C7C5303CB}.Debug|Win32.ActiveCfg = Debug|Win32
{913088F6-37C0-4195-80E9-548C7C5303CB}.Debug|Win32.Build.0 = Debug|Win32
+ {913088F6-37C0-4195-80E9-548C7C5303CB}.Debug|x64.ActiveCfg = Debug|x64
+ {913088F6-37C0-4195-80E9-548C7C5303CB}.Debug|x64.Build.0 = Debug|x64
{913088F6-37C0-4195-80E9-548C7C5303CB}.Release|Win32.ActiveCfg = Release|Win32
{913088F6-37C0-4195-80E9-548C7C5303CB}.Release|Win32.Build.0 = Release|Win32
+ {913088F6-37C0-4195-80E9-548C7C5303CB}.Release|x64.ActiveCfg = Release|x64
+ {913088F6-37C0-4195-80E9-548C7C5303CB}.Release|x64.Build.0 = Release|x64
{F468F539-27BD-468E-BE64-DDE641400B51}.Debug|Win32.ActiveCfg = Debug|Win32
{F468F539-27BD-468E-BE64-DDE641400B51}.Debug|Win32.Build.0 = Debug|Win32
+ {F468F539-27BD-468E-BE64-DDE641400B51}.Debug|x64.ActiveCfg = Debug|x64
+ {F468F539-27BD-468E-BE64-DDE641400B51}.Debug|x64.Build.0 = Debug|x64
{F468F539-27BD-468E-BE64-DDE641400B51}.Release|Win32.ActiveCfg = Release|Win32
{F468F539-27BD-468E-BE64-DDE641400B51}.Release|Win32.Build.0 = Release|Win32
+ {F468F539-27BD-468E-BE64-DDE641400B51}.Release|x64.ActiveCfg = Release|x64
+ {F468F539-27BD-468E-BE64-DDE641400B51}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/tests/AllTests.vcxproj b/tests/AllTests.vcxproj
index c2f48afeb..6190a5f1f 100644
--- a/tests/AllTests.vcxproj
+++ b/tests/AllTests.vcxproj
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{913088F6-37C0-4195-80E9-548C7C5303CB}
@@ -19,11 +27,21 @@
false
MultiByte
+
+ Application
+ false
+ MultiByte
+
Application
false
MultiByte
+
+ Application
+ false
+ MultiByte
+
@@ -31,19 +49,33 @@
+
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.30319.1
..\cpputest_build\
+ ..\cpputest_build\
..\cpputest_build\Release\$(ProjectName)\
+ ..\cpputest_build\Release\$(ProjectName)\
false
+ false
..\cpputest_build\
+ ..\cpputest_build\
..\cpputest_build\Debug\$(ProjectName)\
+ ..\cpputest_build\Debug\$(ProjectName)\
true
+ true
@@ -83,6 +115,43 @@
"$(TargetPath)"
+
+
+ .\Release/AllTests.tlb
+
+
+
+
+ MaxSpeed
+ OnlyExplicitInline
+ WIN32;NDEBUG;_CONSOLE;CPPUTEST_USE_LONG_LONG;%(PreprocessorDefinitions)
+ true
+ MultiThreadedDLL
+ true
+ Level3
+ true
+ ..\include;..\include\CppUTestExt\CppUTestGTest;..\include\CppUTestExt\CppUTestGMock;..\include\Platforms\VisualCpp;%(AdditionalIncludeDirectories)
+ OldStyle
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+ true
+ Console
+ false
+
+
+
+
+ true
+ .\Release/AllTests.bsc
+
+
+ "$(TargetPath)"
+
+
.\Debug/AllTests.tlb
@@ -122,6 +191,44 @@
"$(TargetPath)"
+
+
+ .\Debug/AllTests.tlb
+
+
+
+
+ Disabled
+ ..\include;..\include\CppUTestExt\CppUTestGTest;..\include\CppUTestExt\CppUTestGMock;..\include\Platforms\VisualCpp;%(AdditionalIncludeDirectories)
+ _CONSOLE;WIN32;_DEBUG;CPPUTEST_USE_LONG_LONG;%(PreprocessorDefinitions)
+ EnableFastChecks
+ MultiThreadedDebugDLL
+ true
+ Level3
+ true
+ ProgramDatabase
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+
+
+
+
+ true
+ true
+ Console
+ false
+
+
+
+
+ true
+
+
+ "$(TargetPath)"
+
+
{f468f539-27bd-468e-be64-dde641400b51}