From 3dd019652b14cd1d001f5a5b041107a855543f98 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sun, 12 May 2013 12:24:39 -0700 Subject: [PATCH] Add protobuf unity build to project --- RippleD.props | 6 +++++- newcoin.vcxproj | 11 +++-------- newcoin.vcxproj.filters | 1 + 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/RippleD.props b/RippleD.props index 122a9b01b..aa2224f92 100644 --- a/RippleD.props +++ b/RippleD.props @@ -5,7 +5,11 @@ . $(RepoDir)\src\cpp\ripple - + + $(SolutionDir)build\VisualStudio2012\$(Configuration)\ + $(SolutionDir)build\obj\VisualStudio2012\$(Configuration)\ + rippled + USE_LEVELDB;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/newcoin.vcxproj b/newcoin.vcxproj index 095f51f53..4f6ab075d 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -43,15 +43,9 @@ true - rippled - $(SolutionDir)build\VisualStudio2012\$(Configuration)\ - $(SolutionDir)build\obj\VisualStudio2012\$(Configuration)\ false - rippled - $(SolutionDir)build\VisualStudio2012\$(Configuration)\ - $(SolutionDir)build\obj\VisualStudio2012\$(Configuration)\ @@ -59,7 +53,7 @@ Level3 Disabled BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - .\;..\OpenSSL\include;..\boost_1_52_0;..\protobuf\src;$(RepoDir)\src\cpp\leveldb;$(RepoDir)\src\cpp\leveldb\include + .\;..\OpenSSL\include;..\boost_1_52_0;$(RepoDir)\src\cpp\leveldb;$(RepoDir)\src\cpp\leveldb\include;$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;%(AdditionalIncludeDirectories) ProgramDatabase false true @@ -86,7 +80,7 @@ true true BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - .\;..\OpenSSL\include;..\boost_1_52_0;..\protobuf\src;$(RepoDir)\src\cpp\leveldb;$(RepoDir)\src\cpp\leveldb\include + .\;..\OpenSSL\include;..\boost_1_52_0;$(RepoDir)\src\cpp\leveldb;$(RepoDir)\src\cpp\leveldb\include;$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;%(AdditionalIncludeDirectories) true @@ -109,6 +103,7 @@ %(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories) + diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters index 2b0f1a64d..aa0aa8cef 100644 --- a/newcoin.vcxproj.filters +++ b/newcoin.vcxproj.filters @@ -382,6 +382,7 @@ Source Files +