From 8d1ba09d4d8d905dd3282655bca192eac52b2d79 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Mon, 13 May 2013 18:42:52 -0700 Subject: [PATCH] Link statically to runtimes for VS2012 --- RippleD.props | 4 +-- newcoin.sln | 3 +- newcoin.vcxproj | 89 +++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 91 insertions(+), 5 deletions(-) diff --git a/RippleD.props b/RippleD.props index d57524393..a8aff1752 100644 --- a/RippleD.props +++ b/RippleD.props @@ -6,8 +6,8 @@ $(RepoDir)\src\cpp\ripple - $(SolutionDir)build\VisualStudio2012\$(Configuration)\ - $(SolutionDir)build\obj\VisualStudio2012\$(Configuration)\ + $(SolutionDir)build\VisualStudio2012\$(Configuration).$(Platform)\ + $(SolutionDir)build\obj\VisualStudio2012\$(Configuration).$(Platform)\ rippled diff --git a/newcoin.sln b/newcoin.sln index e1cf48189..3a9841bb7 100644 --- a/newcoin.sln +++ b/newcoin.sln @@ -18,7 +18,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Debug|Win32.ActiveCfg = Debug|Win32 {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Debug|Win32.Build.0 = Debug|Win32 - {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Debug|x64.ActiveCfg = Debug|Win32 + {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Debug|x64.ActiveCfg = Debug|x64 + {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Debug|x64.Build.0 = Debug|x64 {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|Win32.ActiveCfg = Release|Win32 {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|Win32.Build.0 = Release|Win32 {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|x64.ActiveCfg = Release|Win32 diff --git a/newcoin.vcxproj b/newcoin.vcxproj index 02c83b00d..2e64251f8 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {19465545-42EE-42FA-9CC8-F8975F8F1CC7} @@ -22,6 +30,12 @@ MultiByte v110 + + Application + true + MultiByte + v110 + Application false @@ -29,6 +43,13 @@ MultiByte v110 + + Application + false + true + MultiByte + v110 + @@ -36,17 +57,31 @@ + + + + + + + + true + + true + false + + false + NotUsing @@ -54,12 +89,36 @@ BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase false + MultiThreadedDebug Console true %(AdditionalLibraryDirectories) - ssleay32MDd.lib;libeay32MTd.lib;%(AdditionalDependencies) + ssleay32MTd.lib;libeay32MTd.lib;%(AdditionalDependencies) + + + + + + + c:/code/protoc-2.4.1-win32/protoc -I=C:\code\newcoin --cpp_out=C:\code\newcoin C:\code\newcoin/newcoin.proto + + + + + NotUsing + Disabled + BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + false + MultiThreadedDebug + + + Console + true + %(AdditionalLibraryDirectories) + ssleay32MTd.lib;libeay32MTd.lib;%(AdditionalDependencies) @@ -77,6 +136,7 @@ true BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true + MultiThreaded Console @@ -84,7 +144,26 @@ true true %(AdditionalLibraryDirectories) - ssleay32MD.lib;libeay32MD.lib;%(AdditionalDependencies) + ssleay32MT.lib;libeay32MT.lib;%(AdditionalDependencies) + + + + + NotUsing + MaxSpeed + true + true + BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + + + Console + true + true + true + %(AdditionalLibraryDirectories) + ssleay32MT.lib;libeay32MT.lib;%(AdditionalDependencies) @@ -96,7 +175,9 @@ %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) @@ -335,9 +416,13 @@ Document protoc --cpp_out=$(SrcDir) -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)" + protoc --cpp_out=$(SrcDir) -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)" $(SrcDir)\%(Filename).pb.h;$(SrcDir)\%(Filename).pb.cc + $(SrcDir)\%(Filename).pb.h;$(SrcDir)\%(Filename).pb.cc protoc --cpp_out=$(SrcDir) -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)" + protoc --cpp_out=$(SrcDir) -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)" $(SrcDir)\%(Filename).pb.h;$(SrcDir)\%(Filename).pb.cc + $(SrcDir)\%(Filename).pb.h;$(SrcDir)\%(Filename).pb.cc