Move protoc generated files to build\proto for MSVC builds

shin4141 · May 27, 2013 · c8044dc · c8044dc
1 parent b0539b4
commit c8044dc
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,7 +37,3 @@ db/*.db-*
 rippled.cfg
 validators.txt
 test/config.js
-
-# These are generated by protoc
-ripple.pb.cc
-ripple.pb.h
diff --git a/RippleD.props b/RippleD.props
@@ -15,7 +15,7 @@
       <PreprocessorDefinitions>USE_LEVELDB;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>$(RepoDir)\src\cpp\leveldb;$(RepoDir)\src\cpp\leveldb\include;$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoDir);$(RepoDir)\src\cpp\leveldb;$(RepoDir)\src\cpp\leveldb\include;$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir)\build\proto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

diff --git a/modules/ripple_basics/ripple_basics.cpp b/modules/ripple_basics/ripple_basics.cpp
@@ -74,6 +74,8 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 #include "src/cpp/ripple/SHAMapSync.cpp"
 #include "src/cpp/ripple/utils.cpp" // no log
 
+#include "ripple.pb.cc"
+
 #ifdef _MSC_VER
 //#pragma warning (pop)
 #endif
diff --git a/newcoin.vcxproj b/newcoin.vcxproj
@@ -167,6 +167,12 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="build\proto\ripple.pb.cc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="modules\ripple_basics\ripple_basics.cpp" />
     <ClCompile Include="modules\ripple_client\ripple_client.cpp" />
     <ClCompile Include="modules\ripple_db\ripple_db.cpp" />
@@ -874,7 +880,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\ripple.pb.cc" />
     <ClCompile Include="src\cpp\ripple\RippleAddress.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1154,6 +1159,7 @@
     <ClCompile Include="src\cpp\websocket_core.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="build\proto\ripple.pb.h" />
     <ClInclude Include="database\sqlite3.h" />
     <ClInclude Include="database\sqlite3ext.h" />
     <ClInclude Include="modules\ripple_basics\ripple_basics.h" />
@@ -1586,7 +1592,6 @@
     <ClInclude Include="src\cpp\ripple\RangeSet.h" />
     <ClInclude Include="src\cpp\ripple\RegularKeySetTransactor.h" />
     <ClInclude Include="src\cpp\ripple\rfc1751.h" />
-    <ClInclude Include="src\cpp\ripple\ripple.pb.h" />
     <ClInclude Include="src\cpp\ripple\RippleAddress.h" />
     <ClInclude Include="src\cpp\ripple\RippleCalc.h" />
     <ClInclude Include="src\cpp\ripple\RippleState.h" />
@@ -1649,13 +1654,13 @@
     <None Include="SConstruct" />
     <CustomBuild Include="src\cpp\ripple\ripple.proto">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">protoc --cpp_out=$(SrcDir) -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">protoc --cpp_out=$(RepoDir)\build\proto -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">protoc --cpp_out=$(SrcDir) -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SrcDir)\%(Filename).pb.h;$(SrcDir)\%(Filename).pb.cc</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(RepoDir)\build\proto\%(Filename).pb.h;$(RepoDir)\build\proto\%(Filename).pb.cc</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SrcDir)\%(Filename).pb.h;$(SrcDir)\%(Filename).pb.cc</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">protoc --cpp_out=$(SrcDir) -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">protoc --cpp_out=$(RepoDir)\build\proto -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">protoc --cpp_out=$(SrcDir) -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SrcDir)\%(Filename).pb.h;$(SrcDir)\%(Filename).pb.cc</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(RepoDir)\build\proto\%(Filename).pb.h;$(RepoDir)\build\proto\%(Filename).pb.cc</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SrcDir)\%(Filename).pb.h;$(SrcDir)\%(Filename).pb.cc</Outputs>
     </CustomBuild>
     <None Include="src\cpp\json\json_internalarray.inl">

diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
@@ -49,9 +49,6 @@
     <Filter Include="0. Third Party Code\protobuf\stubs">
       <UniqueIdentifier>{27858e65-9580-4a67-b0c5-054e970516af}</UniqueIdentifier>
     </Filter>
-    <Filter Include="protoc_generated">
-      <UniqueIdentifier>{7a289f3b-0204-4a4d-b161-589efd3589c0}</UniqueIdentifier>
-    </Filter>
     <Filter Include="1. Modules">
       <UniqueIdentifier>{a152ed99-bd05-4c37-8ae7-82888b1bb469}</UniqueIdentifier>
     </Filter>
@@ -115,6 +112,9 @@
     <Filter Include="1. Modules\ripple_basics\containers">
       <UniqueIdentifier>{683c494b-1175-49ac-9714-65640ba50bf5}</UniqueIdentifier>
     </Filter>
+    <Filter Include="1. Modules\ripple_basics\protobuf">
+      <UniqueIdentifier>{eb0c6bda-cf68-4334-a8c3-8d39202852a0}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\cpp\database\sqlite3.c">
@@ -723,8 +723,8 @@
     <ClCompile Include="src\cpp\ripple\Pathfinder.cpp">
       <Filter>1. Modules\ripple_ledger\processing</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\ripple\ripple.pb.cc">
-      <Filter>protoc_generated</Filter>
+    <ClCompile Include="build\proto\ripple.pb.cc">
+      <Filter>1. Modules\ripple_basics\protobuf</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -1361,8 +1361,8 @@
     <ClInclude Include="src\cpp\ripple\NetworkStatus.h">
       <Filter>1. Modules\ripple_main\core</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\ripple\ripple.pb.h">
-      <Filter>protoc_generated</Filter>
+    <ClInclude Include="build\proto\ripple.pb.h">
+      <Filter>1. Modules\ripple_basics\protobuf</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>