From 245f3e756808c89e14674250e2b81d5c9ea95b36 Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Sat, 8 Dec 2012 21:55:47 -0600 Subject: [PATCH] VS 2012 mods to proj/sln files VS 2012 modifications to project/solution files added WinTestRunner dependency on CppUnit --- CppUnit/CppUnit_vs110.sln | 3 + Crypto/Crypto_vs110.vcxproj | 211 +++++++++++++---------- Crypto/testsuite/TestSuite_vs110.vcxproj | 178 +++++++++++-------- 3 files changed, 227 insertions(+), 165 deletions(-) diff --git a/CppUnit/CppUnit_vs110.sln b/CppUnit/CppUnit_vs110.sln index 299cae3b9..5ae1ef9d7 100644 --- a/CppUnit/CppUnit_vs110.sln +++ b/CppUnit/CppUnit_vs110.sln @@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs110.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_vs110.vcxproj", "{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}" + ProjectSection(ProjectDependencies) = postProject + {138BB448-808A-4FE5-A66D-78D1F8770F59} = {138BB448-808A-4FE5-A66D-78D1F8770F59} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Crypto/Crypto_vs110.vcxproj b/Crypto/Crypto_vs110.vcxproj index e1873768c..e3d87b553 100644 --- a/Crypto/Crypto_vs110.vcxproj +++ b/Crypto/Crypto_vs110.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,82 +32,111 @@ Crypto Win32Proj - - + + StaticLibrary MultiByte v110 - + StaticLibrary MultiByte v110 - + StaticLibrary MultiByte v110 - + StaticLibrary MultiByte v110 - + DynamicLibrary MultiByte v110 - + DynamicLibrary MultiByte v110 - - - - + + + + - - + + - - + + - - + + - - + + - - + + - + <_ProjectFileVersion>10.0.40219.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoCryptod - PocoCryptomdd - PocoCryptomtd - PocoCrypto - PocoCryptomd - PocoCryptomt + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoCryptod + PocoCryptomdd + PocoCryptomtd + PocoCrypto + PocoCryptomd + PocoCryptomt - + + C:\OpenSSL\include;$(IncludePath) + $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib + C:\OpenSSL\lib\VC\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib + + + C:\OpenSSL\include;$(IncludePath) + $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib + C:\OpenSSL\lib\VC\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib + + + C:\OpenSSL\include;$(IncludePath) + $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib + C:\OpenSSL\lib\VC\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib + + + C:\OpenSSL\include;$(IncludePath) + C:\OpenSSL\lib\VC\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib + + + C:\OpenSSL\include;$(IncludePath) + $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib + C:\OpenSSL\lib\VC;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib + + + C:\OpenSSL\include;$(IncludePath) + $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib + C:\OpenSSL\lib\VC;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib + + Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) @@ -120,7 +149,7 @@ true true true - + Level3 EditAndContinue Default @@ -138,7 +167,7 @@ MachineX86 - + Disabled OnlyExplicitInline @@ -153,9 +182,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -172,7 +201,7 @@ MachineX86 - + Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) @@ -185,7 +214,7 @@ true true true - + ..\lib\PocoCryptomtd.pdb Level3 EditAndContinue @@ -196,7 +225,7 @@ ..\lib\PocoCryptomtd.lib - + Disabled OnlyExplicitInline @@ -211,9 +240,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -221,7 +250,7 @@ ..\lib\PocoCryptomt.lib - + Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) @@ -234,7 +263,7 @@ true true true - + ..\lib\PocoCryptomdd.pdb Level3 EditAndContinue @@ -245,7 +274,7 @@ ..\lib\PocoCryptomdd.lib - + Disabled OnlyExplicitInline @@ -260,10 +289,10 @@ true true true - + ..\lib\PocoCryptomd.pdb Level3 - + Default %(DisableSpecificWarnings) @@ -273,41 +302,41 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - + + + \ No newline at end of file diff --git a/Crypto/testsuite/TestSuite_vs110.vcxproj b/Crypto/testsuite/TestSuite_vs110.vcxproj index 214b511c5..6bd4eb42e 100644 --- a/Crypto/testsuite/TestSuite_vs110.vcxproj +++ b/Crypto/testsuite/TestSuite_vs110.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,92 +32,122 @@ TestSuite Win32Proj - - + + Application Dynamic MultiByte v110 - + Application Dynamic MultiByte v110 - + Application Static MultiByte v110 - + Application Static MultiByte v110 - + Application Dynamic MultiByte v110 - + Application Dynamic MultiByte v110 - - - - + + + + - - + + - - + + - - + + - - + + - - + + - + <_ProjectFileVersion>10.0.40219.1 - bin\ - obj\$(Configuration)\ - true - bin\ - obj\$(Configuration)\ - false - bin\static_mt\ - obj\$(Configuration)\ - true - bin\static_mt\ - obj\$(Configuration)\ - false - bin\static_md\ - obj\$(Configuration)\ - true - bin\static_md\ - obj\$(Configuration)\ - false - TestSuited - TestSuited - TestSuited - TestSuite - TestSuite - TestSuite + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + TestSuited + TestSuited + TestSuited + TestSuite + TestSuite + TestSuite - + + $(ExecutablePath) + C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + C:\OpenSSL\lib;C:\OpenSSL\lib\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + + + $(ExecutablePath) + C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + C:\OpenSSL\lib;C:\OpenSSL\lib\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + + + $(ExecutablePath) + C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + C:\OpenSSL\lib;C:\OpenSSL\lib\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + + + $(ExecutablePath) + C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + C:\OpenSSL\lib;C:\OpenSSL\lib\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + + + $(ExecutablePath) + C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + C:\OpenSSL\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + + + $(ExecutablePath) + C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + C:\OpenSSL\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + + Disabled ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) @@ -130,7 +160,7 @@ true true true - + Level3 EditAndContinue Default @@ -147,7 +177,7 @@ MachineX86 - + Disabled OnlyExplicitInline @@ -162,9 +192,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -179,7 +209,7 @@ MachineX86 - + Disabled ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) @@ -192,7 +222,7 @@ true true true - + Level3 EditAndContinue Default @@ -210,7 +240,7 @@ MachineX86 - + Disabled OnlyExplicitInline @@ -225,9 +255,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -243,7 +273,7 @@ MachineX86 - + Disabled ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) @@ -256,7 +286,7 @@ true true true - + Level3 EditAndContinue Default @@ -273,7 +303,7 @@ MachineX86 - + Disabled OnlyExplicitInline @@ -288,9 +318,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -306,18 +336,18 @@ - - - - + + + + - - - - - + + + + + - - - + + + \ No newline at end of file