From ef01f82e0ced488719e39fbf55b26ec6e2d5a12e Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Wed, 25 Feb 2015 14:59:49 -0800 Subject: [PATCH] Add nounity targets to msvc projects --- Builds/VisualStudio2013/RippleD.vcxproj | 890 +++++++++++++----- .../VisualStudio2013/RippleD.vcxproj.filters | 6 + Builds/VisualStudio2013/ripple.sln | 24 +- SConstruct | 5 + 4 files changed, 685 insertions(+), 240 deletions(-) diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj index ed138af42..528f490ec 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj +++ b/Builds/VisualStudio2013/RippleD.vcxproj @@ -7,16 +7,35 @@ true + + debug.classic + x64 + debug x64 + + release.classic + x64 + release x64 + + MultiByte + Application + v120 + False + False + False + false + ..\..\build\msvc.debug.nounity\src\ + ..\..\build\msvc.debug.nounity\ + MultiByte Application @@ -28,6 +47,17 @@ ..\..\build\msvc.debug\src\ ..\..\build\msvc.debug\ + + MultiByte + Application + v120 + False + False + False + false + ..\..\build\msvc.release.nounity\src\ + ..\..\build\msvc.release.nounity\ + MultiByte Application @@ -41,13 +71,56 @@ + + + + + + + + + HAVE_USLEEP=1;_WIN32_WINNT=0x6000;DEBUG;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;_DEBUG;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;%(AdditionalIncludeDirectories) + 4800;4244;4267;4018 + Async + MultiThreadedDebug + Precise + False + EnableFastChecks + None + True + True + True + False + True + Disabled + False + False + ProgramDatabase + Cdecl + True + Level3 + /bigobj /FS %(AdditionalOptions) + + + advapi32.lib;comdlg32.lib;gdi32.lib;kernel32.lib;libeay32MT.lib;odbc32.lib;odbccp32.lib;ole32.lib;oleaut32.lib;shell32.lib;Shlwapi.lib;ssleay32MT.lib;user32.lib;uuid.lib;winspool.lib;%(AdditionalDependencies) + True + NoErrorReport + Console + True + true + True + MachineX64 + /MANIFEST /TLBID:1 %(AdditionalOptions) + + HAVE_USLEEP=1;_WIN32_WINNT=0x6000;DEBUG;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;_DEBUG;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -85,6 +158,41 @@ /MANIFEST /TLBID:1 %(AdditionalOptions) + + + HAVE_USLEEP=1;_WIN32_WINNT=0x6000;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;NDEBUG;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;%(AdditionalIncludeDirectories) + 4800;4244;4267;4018 + Async + Precise + False + None + True + True + MultiThreaded + False + True + False + False + ProgramDatabase + Cdecl + True + Full + Level3 + /bigobj /FS %(AdditionalOptions) + + + advapi32.lib;comdlg32.lib;gdi32.lib;kernel32.lib;libeay32MT.lib;odbc32.lib;odbccp32.lib;ole32.lib;oleaut32.lib;shell32.lib;Shlwapi.lib;ssleay32MT.lib;user32.lib;uuid.lib;winspool.lib;%(AdditionalDependencies) + True + NoErrorReport + Console + True + true + True + MachineX64 + /MANIFEST /TLBID:1 %(AdditionalOptions) + + HAVE_USLEEP=1;_WIN32_WINNT=0x6000;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;NDEBUG;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -1336,16 +1444,20 @@ - True + True + True - True + True + True - True + True + True - True + True + True @@ -1356,205 +1468,246 @@ - 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 + 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 + 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 - 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 @@ -1563,111 +1716,136 @@ - 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 + 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 + True + True - True + True + True - True + True + True - True + True + True @@ -1678,97 +1856,120 @@ - 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 + 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 + True + True - True + True + True @@ -1793,48 +1994,62 @@ - 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 + True - True + True + True - True + True + True - True + True + True @@ -1869,22 +2084,28 @@ - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True @@ -1901,24 +2122,30 @@ - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True @@ -1937,10 +2164,12 @@ - True + True + True - True + True + True @@ -1961,49 +2190,62 @@ - 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 + True - True + True + True - True + True + True @@ -2012,29 +2254,36 @@ - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True @@ -2047,7 +2296,8 @@ - True + True + True @@ -2056,25 +2306,32 @@ - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True @@ -2089,19 +2346,34 @@ - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -2112,7 +2384,10 @@ - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -2121,33 +2396,54 @@ - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -2162,46 +2458,66 @@ - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - True + True + True + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True @@ -2222,13 +2538,16 @@ - True + True + True - True + True + True - True + True + True @@ -2237,7 +2556,8 @@ - True + True + True @@ -2250,22 +2570,26 @@ - True + True + True - True + True + True - True + True + True - True + True + True @@ -2294,17 +2618,20 @@ - True + True + True - True + True + True - True + True + True @@ -2319,88 +2646,120 @@ - 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 + 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 + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True @@ -2426,6 +2785,8 @@ + + @@ -2463,25 +2824,32 @@ - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True @@ -2492,12 +2860,22 @@ + Document + protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity) + ..\..\build\proto\ripple.pb.h;..\..\build\proto\ripple.pb.cc + protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity) + false Document protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity) ..\..\build\proto\ripple.pb.h;..\..\build\proto\ripple.pb.cc protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity) false Document + protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity) + ..\..\build\proto\ripple.pb.h;..\..\build\proto\ripple.pb.cc + protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity) + false + Document protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity) ..\..\build\proto\ripple.pb.h;..\..\build\proto\ripple.pb.cc protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity) @@ -2915,25 +3293,32 @@ - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True - True + True + True @@ -2952,48 +3337,79 @@ - 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 + True + True + True + ..\..\src\ed25519-donna;%(AdditionalIncludeDirectories) ..\..\src\ed25519-donna;%(AdditionalIncludeDirectories) + ..\..\src\ed25519-donna;%(AdditionalIncludeDirectories) ..\..\src\ed25519-donna;%(AdditionalIncludeDirectories) @@ -3001,29 +3417,43 @@ + True + True + True + True + True + True ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + True + True + True + True + True + True + ..\..\src\rocksdb2;..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) ..\..\src\rocksdb2;..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2;..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) ..\..\src\rocksdb2;..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -3033,9 +3463,13 @@ + True + True + ..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) ..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) ..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters index 501f0309e..cf763724f 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters @@ -3372,6 +3372,9 @@ ripple\protocol\impl + + ripple\protocol\impl + ripple\protocol\impl @@ -3459,6 +3462,9 @@ ripple\protocol + + ripple\protocol + ripple\protocol diff --git a/Builds/VisualStudio2013/ripple.sln b/Builds/VisualStudio2013/ripple.sln index 48992fd0c..a05e9d484 100644 --- a/Builds/VisualStudio2013/ripple.sln +++ b/Builds/VisualStudio2013/ripple.sln @@ -7,20 +7,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RippleD", "RippleD.vcxproj" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 + debug.classic|x64 = debug.classic|x64 + debug|x64 = debug|x64 + release.classic|x64 = release.classic|x64 + release|x64 = release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.Debug|Win32.ActiveCfg = debug|x64 - {26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.Debug|Win32.Build.0 = debug|x64 - {26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.Debug|x64.ActiveCfg = debug|x64 - {26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.Debug|x64.Build.0 = debug|x64 - {26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.Release|Win32.ActiveCfg = release|x64 - {26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.Release|Win32.Build.0 = release|x64 - {26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.Release|x64.ActiveCfg = release|x64 - {26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.Release|x64.Build.0 = release|x64 + {26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.debug.classic|x64.ActiveCfg = debug.classic|x64 + {26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.debug.classic|x64.Build.0 = debug.classic|x64 + {26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.debug|x64.ActiveCfg = debug|x64 + {26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.debug|x64.Build.0 = debug|x64 + {26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.release.classic|x64.ActiveCfg = release.classic|x64 + {26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.release.classic|x64.Build.0 = release.classic|x64 + {26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.release|x64.ActiveCfg = release|x64 + {26B7D9AC-1A80-8EF8-6703-D061F1BECB75}.release|x64.Build.0 = release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SConstruct b/SConstruct index 2534e6ddc..f088e6eb6 100644 --- a/SConstruct +++ b/SConstruct @@ -734,6 +734,10 @@ for tu_style in ['classic', 'unity']: if toolchain in toolchains: aliases['all'].extend(target) aliases[toolchain].extend(target) + elif toolchain == 'msvc': + config = env.VSProjectConfig(variant + ".classic", 'x64', target, env) + msvc_configs.append(config) + if toolchain in toolchains: aliases[variant].extend(target) env.Alias(variant_name, target) @@ -776,3 +780,4 @@ def do_count(target, source, env): print "Total unit test lines: %d" % lines PhonyTargets(env, count = do_count) +