diff --git a/vsprojects/google_glog.props b/vsprojects/google_glog.props new file mode 100644 index 0000000000000..34469afcf1a44 --- /dev/null +++ b/vsprojects/google_glog.props @@ -0,0 +1,15 @@ + + + + + + + $(SolutionDir)..\..\glog\src\windows;%(AdditionalIncludeDirectories) + + + $(SolutionDir)..\..\glog\$(Configuration)\$(Platform);%(AdditionalLibraryDirectories) + libglog_static.lib;%(AdditionalDependencies) + + + + \ No newline at end of file diff --git a/vsprojects/google_googlemock_main.props b/vsprojects/google_googlemock_main.props new file mode 100644 index 0000000000000..96ef3761a4532 --- /dev/null +++ b/vsprojects/google_googlemock_main.props @@ -0,0 +1,15 @@ + + + + + + + $(SolutionDir)..\..\googletest\googlemock\include;%(AdditionalIncludeDirectories) + + + $(SolutionDir)..\..\googletest\googlemock\msvc\2015\$(Configuration)\$(Platform);%(AdditionalLibraryDirectories) + gmock.lib;gmock_main.lib;%(AdditionalDependencies) + + + + \ No newline at end of file diff --git a/vsprojects/google_googletest.props b/vsprojects/google_googletest.props new file mode 100644 index 0000000000000..fd5306eaf1aff --- /dev/null +++ b/vsprojects/google_googletest.props @@ -0,0 +1,16 @@ + + + + + + $(SolutionDir)..\..\googletest\googletest\include;$(SolutionDir)..\..\googletest\googletest;$(IncludePath) + + + + + gtest.lib;%(AdditionalDependencies) + $(SolutionDir)..\..\googletest\googletest\msvc\$(Configuration)\$(Platform);%(AdditionalLibraryDirectories) + + + + \ No newline at end of file diff --git a/vsprojects/google_googletest_main.props b/vsprojects/google_googletest_main.props new file mode 100644 index 0000000000000..c8d2cc789ff43 --- /dev/null +++ b/vsprojects/google_googletest_main.props @@ -0,0 +1,16 @@ + + + + + + $(SolutionDir)..\..\googletest\googletest\include;$(SolutionDir)..\..\googletest\googletest;$(IncludePath) + + + + + gtest_main.lib;%(AdditionalDependencies) + $(SolutionDir)..\..\googletest\googletest\msvc\gtest\$(Configuration)\$(Platform);%(AdditionalLibraryDirectories) + + + + \ No newline at end of file diff --git a/vsprojects/google_test_framework.props b/vsprojects/google_test_framework.props deleted file mode 100644 index d5e9b00d23664..0000000000000 --- a/vsprojects/google_test_framework.props +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - $(SolutionDir)..\..\gmock-1.7.0\gtest\include;$(SolutionDir)..\..\gmock-1.7.0\include;$(SolutionDir)..\..\glog-0.3.3\src\windows;%(AdditionalIncludeDirectories) - GOOGLE_GLOG_DLL_DECL=;%(PreprocessorDefinitions) - - - $(SolutionDir)..\..\glog-0.3.3\$(ConfigurationName);$(SolutionDir)..\..\gmock-1.7.0\msvc\2010\$(ConfigurationName);%(AdditionalLibraryDirectories) - libglog_static.lib;gmock.lib;gmock_main.lib;%(AdditionalDependencies) - - - - \ No newline at end of file diff --git a/vsprojects/libprotobuf-lite.vcxproj b/vsprojects/libprotobuf-lite.vcxproj index 241aea468773c..ed626e84ed4b0 100644 --- a/vsprojects/libprotobuf-lite.vcxproj +++ b/vsprojects/libprotobuf-lite.vcxproj @@ -1,27 +1,44 @@  - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {49EA010D-706F-4BE2-A397-77854B72A040} Win32Proj + 8.1 StaticLibrary - v120 + v140 + + + StaticLibrary + v140 StaticLibrary - v120 + v140 + + + StaticLibrary + v140 @@ -29,20 +46,34 @@ + + + + + + <_ProjectFileVersion>12.0.30501.0 - Debug\ - $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ + + + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ - Release\ - $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ + + + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ @@ -58,6 +89,20 @@ ProgramDatabase + + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions) + Disabled + ../src;.;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions) @@ -69,8 +114,23 @@ ProgramDatabase + + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions) + ../src;.;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + + + @@ -80,14 +140,21 @@ + - + + + + + + + @@ -103,11 +170,18 @@ - + + + + + + + + diff --git a/vsprojects/libprotobuf-lite.vcxproj.filters b/vsprojects/libprotobuf-lite.vcxproj.filters index 296369dfbb82f..a47ccd8acb71a 100644 --- a/vsprojects/libprotobuf-lite.vcxproj.filters +++ b/vsprojects/libprotobuf-lite.vcxproj.filters @@ -36,9 +36,6 @@ Header Files - - Header Files - Header Files @@ -81,11 +78,41 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + - - Source Files - Source Files @@ -128,5 +155,29 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + \ No newline at end of file diff --git a/vsprojects/libprotobuf.vcxproj b/vsprojects/libprotobuf.vcxproj index 75cc5328b442f..b83d9192c068b 100644 --- a/vsprojects/libprotobuf.vcxproj +++ b/vsprojects/libprotobuf.vcxproj @@ -1,27 +1,44 @@  - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30} Win32Proj + 8.1 StaticLibrary - v120 + v140 + + + StaticLibrary + v140 StaticLibrary - v120 + v140 + + + StaticLibrary + v140 @@ -29,20 +46,34 @@ + + + + + + <_ProjectFileVersion>12.0.30501.0 - Debug\ - $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + + + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ - Release\ - $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ + + + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ @@ -58,6 +89,20 @@ ProgramDatabase + + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions) + Disabled + ../src;.;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions) @@ -69,14 +114,36 @@ ProgramDatabase + + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions) + ../src;.;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + + + + + + + + + + @@ -88,33 +155,74 @@ + + + + + + + - + + + + + + + - + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -122,9 +230,12 @@ + + + @@ -141,18 +252,47 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vsprojects/libprotobuf.vcxproj.filters b/vsprojects/libprotobuf.vcxproj.filters index 66426d11dc38c..cd9f645d0d0c6 100644 --- a/vsprojects/libprotobuf.vcxproj.filters +++ b/vsprojects/libprotobuf.vcxproj.filters @@ -15,15 +15,9 @@ - - Header Files - Header Files - - Header Files - Header Files @@ -39,15 +33,9 @@ Header Files - - Header Files - Header Files - - Header Files - Header Files @@ -66,21 +54,12 @@ Header Files - - Header Files - Header Files - - Header Files - Header Files - - Header Files - Header Files @@ -90,27 +69,18 @@ Header Files - - Header Files - Header Files Header Files - - Header Files - Header Files Header Files - - Header Files - Header Files @@ -126,6 +96,177 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + Header Files @@ -135,129 +276,237 @@ Header Files - + Header Files - + Header Files - - Source Files + + Header Files + + + Header Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + Source Files Source Files - + Source Files - + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + Source Files diff --git a/vsprojects/libprotoc.vcxproj b/vsprojects/libprotoc.vcxproj index 4b55850cf8832..45db74a55260a 100644 --- a/vsprojects/libprotoc.vcxproj +++ b/vsprojects/libprotoc.vcxproj @@ -1,27 +1,44 @@  - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE} Win32Proj + 8.1 StaticLibrary - v120 + v140 + + + StaticLibrary + v140 StaticLibrary - v120 + v140 + + + StaticLibrary + v140 @@ -29,20 +46,34 @@ + + + + + + <_ProjectFileVersion>12.0.30501.0 - Debug\ - $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ + + + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ - Release\ - $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ + + + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ @@ -58,6 +89,20 @@ ProgramDatabase + + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions) + Disabled + ../src;.;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPROTOC_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions) @@ -69,6 +114,18 @@ ProgramDatabase + + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions) + ../src;.;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPROTOC_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + @@ -79,33 +136,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -125,6 +248,22 @@ + + + + + + + + + + + + + + + + @@ -132,6 +271,7 @@ + @@ -139,24 +279,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vsprojects/libprotoc.vcxproj.filters b/vsprojects/libprotoc.vcxproj.filters index d8ca3347c1bd0..7b7847d95b12f 100644 --- a/vsprojects/libprotoc.vcxproj.filters +++ b/vsprojects/libprotoc.vcxproj.filters @@ -129,11 +129,206 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + - - Header Files - Source Files @@ -278,5 +473,137 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + \ No newline at end of file diff --git a/vsprojects/lite-test.vcxproj b/vsprojects/lite-test.vcxproj index b62fb7615694c..812cc865decda 100644 --- a/vsprojects/lite-test.vcxproj +++ b/vsprojects/lite-test.vcxproj @@ -1,28 +1,45 @@  - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {12015ACE-42BE-4952-A5A0-44A9A46908E2} tests Win32Proj + 8.1 Application - v120 + v140 + + + Application + v140 Application - v120 + v140 + + + Application + v140 @@ -30,22 +47,38 @@ + + + + + + <_ProjectFileVersion>12.0.30501.0 - Debug\ - $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + true + $(SolutionDir)$(Configuration)\$(Platform)\ + + true + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ - Release\ - $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ true + $(SolutionDir)$(Configuration)\$(Platform)\ + + + true + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ @@ -70,6 +103,30 @@ MachineX86 + + + + + + + + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 /bigobj %(AdditionalOptions) + Disabled + ../src;.;../gtest/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + true + Console + + @@ -92,49 +149,92 @@ MachineX86 + + + + + + + + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions) + ../src;.;../gtest/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + true + Console + true + true + + + + + + + + + - Generating unittest_import_lite.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_lite.proto - - google\protobuf\unittest_import_lite.pb.h;google\protobuf\unittest_import_lite.pb.cc;%(Outputs) - Generating unittest_import_lite.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_lite.proto - - google\protobuf\unittest_import_lite.pb.h;google\protobuf\unittest_import_lite.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_import_public_lite.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_public_lite.proto - - google\protobuf\unittest_import_public_lite.pb.h;google\protobuf\unittest_import_public_lite.pb.cc;%(Outputs) - Generating unittest_import_public_lite.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_public_lite.proto - - google\protobuf\unittest_import_public_lite.pb.h;google\protobuf\unittest_import_public_lite.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_lite.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite.proto - - google\protobuf\unittest_lite.pb.h;google\protobuf\unittest_lite.pb.cc;%(Outputs) - Generating unittest_lite.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite.proto - - google\protobuf\unittest_lite.pb.h;google\protobuf\unittest_lite.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) @@ -147,6 +247,34 @@ false + + + Document + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + + + + + Document + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + + diff --git a/vsprojects/lite-test.vcxproj.filters b/vsprojects/lite-test.vcxproj.filters index d758afcfe9900..98557f73d95a8 100644 --- a/vsprojects/lite-test.vcxproj.filters +++ b/vsprojects/lite-test.vcxproj.filters @@ -27,6 +27,15 @@ Header Files + + Header Files + + + Header Files + + + Header Files + @@ -44,10 +53,24 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/vsprojects/portability_macros.props b/vsprojects/portability_macros.props new file mode 100644 index 0000000000000..651a30c546b94 --- /dev/null +++ b/vsprojects/portability_macros.props @@ -0,0 +1,14 @@ + + + + + + <_PropertySheetDisplayName>google_protobuf_portability_macros + + + + CONFIGURATION=R"literal($(Configuration))literal";PLATFORM_NAME=R"literal($(PlatformName))literal";SOLUTION_DIR=R"literal($(SolutionDir))literal";%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/vsprojects/protobuf.sln b/vsprojects/protobuf.sln index f2f0243a76807..f5123090e227d 100644 --- a/vsprojects/protobuf.sln +++ b/vsprojects/protobuf.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libprotobuf", "libprotobuf.vcxproj", "{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}" EndProject @@ -10,6 +10,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "protoc", "protoc.vcxproj", "{1738D5F6-ED1E-47E0-B2F0-456864B93C1E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests.vcxproj", "{4DF72760-C055-40A5-A77E-30A17E2AC2DB}" + ProjectSection(ProjectDependencies) = postProject + {1738D5F6-ED1E-47E0-B2F0-456864B93C1E} = {1738D5F6-ED1E-47E0-B2F0-456864B93C1E} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libprotobuf-lite", "libprotobuf-lite.vcxproj", "{49EA010D-706F-4BE2-A397-77854B72A040}" EndProject @@ -20,37 +23,67 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Debug|Win32.ActiveCfg = Debug|Win32 {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Debug|Win32.Build.0 = Debug|Win32 + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Debug|x64.ActiveCfg = Debug|x64 + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Debug|x64.Build.0 = Debug|x64 {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Release|Win32.ActiveCfg = Release|Win32 {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Release|Win32.Build.0 = Release|Win32 + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Release|x64.ActiveCfg = Release|x64 + {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Release|x64.Build.0 = Release|x64 {B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE}.Debug|Win32.ActiveCfg = Debug|Win32 {B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE}.Debug|Win32.Build.0 = Debug|Win32 + {B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE}.Debug|x64.ActiveCfg = Debug|x64 + {B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE}.Debug|x64.Build.0 = Debug|x64 {B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE}.Release|Win32.ActiveCfg = Release|Win32 {B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE}.Release|Win32.Build.0 = Release|Win32 + {B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE}.Release|x64.ActiveCfg = Release|x64 + {B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE}.Release|x64.Build.0 = Release|x64 {1738D5F6-ED1E-47E0-B2F0-456864B93C1E}.Debug|Win32.ActiveCfg = Debug|Win32 {1738D5F6-ED1E-47E0-B2F0-456864B93C1E}.Debug|Win32.Build.0 = Debug|Win32 + {1738D5F6-ED1E-47E0-B2F0-456864B93C1E}.Debug|x64.ActiveCfg = Debug|x64 + {1738D5F6-ED1E-47E0-B2F0-456864B93C1E}.Debug|x64.Build.0 = Debug|x64 {1738D5F6-ED1E-47E0-B2F0-456864B93C1E}.Release|Win32.ActiveCfg = Release|Win32 {1738D5F6-ED1E-47E0-B2F0-456864B93C1E}.Release|Win32.Build.0 = Release|Win32 + {1738D5F6-ED1E-47E0-B2F0-456864B93C1E}.Release|x64.ActiveCfg = Release|x64 + {1738D5F6-ED1E-47E0-B2F0-456864B93C1E}.Release|x64.Build.0 = Release|x64 {4DF72760-C055-40A5-A77E-30A17E2AC2DB}.Debug|Win32.ActiveCfg = Debug|Win32 {4DF72760-C055-40A5-A77E-30A17E2AC2DB}.Debug|Win32.Build.0 = Debug|Win32 + {4DF72760-C055-40A5-A77E-30A17E2AC2DB}.Debug|x64.ActiveCfg = Debug|x64 + {4DF72760-C055-40A5-A77E-30A17E2AC2DB}.Debug|x64.Build.0 = Debug|x64 {4DF72760-C055-40A5-A77E-30A17E2AC2DB}.Release|Win32.ActiveCfg = Release|Win32 {4DF72760-C055-40A5-A77E-30A17E2AC2DB}.Release|Win32.Build.0 = Release|Win32 + {4DF72760-C055-40A5-A77E-30A17E2AC2DB}.Release|x64.ActiveCfg = Release|x64 + {4DF72760-C055-40A5-A77E-30A17E2AC2DB}.Release|x64.Build.0 = Release|x64 {49EA010D-706F-4BE2-A397-77854B72A040}.Debug|Win32.ActiveCfg = Debug|Win32 {49EA010D-706F-4BE2-A397-77854B72A040}.Debug|Win32.Build.0 = Debug|Win32 + {49EA010D-706F-4BE2-A397-77854B72A040}.Debug|x64.ActiveCfg = Debug|x64 + {49EA010D-706F-4BE2-A397-77854B72A040}.Debug|x64.Build.0 = Debug|x64 {49EA010D-706F-4BE2-A397-77854B72A040}.Release|Win32.ActiveCfg = Release|Win32 {49EA010D-706F-4BE2-A397-77854B72A040}.Release|Win32.Build.0 = Release|Win32 + {49EA010D-706F-4BE2-A397-77854B72A040}.Release|x64.ActiveCfg = Release|x64 + {49EA010D-706F-4BE2-A397-77854B72A040}.Release|x64.Build.0 = Release|x64 {12015ACE-42BE-4952-A5A0-44A9A46908E2}.Debug|Win32.ActiveCfg = Debug|Win32 {12015ACE-42BE-4952-A5A0-44A9A46908E2}.Debug|Win32.Build.0 = Debug|Win32 + {12015ACE-42BE-4952-A5A0-44A9A46908E2}.Debug|x64.ActiveCfg = Debug|x64 + {12015ACE-42BE-4952-A5A0-44A9A46908E2}.Debug|x64.Build.0 = Debug|x64 {12015ACE-42BE-4952-A5A0-44A9A46908E2}.Release|Win32.ActiveCfg = Release|Win32 {12015ACE-42BE-4952-A5A0-44A9A46908E2}.Release|Win32.Build.0 = Release|Win32 + {12015ACE-42BE-4952-A5A0-44A9A46908E2}.Release|x64.ActiveCfg = Release|x64 + {12015ACE-42BE-4952-A5A0-44A9A46908E2}.Release|x64.Build.0 = Release|x64 {CBBD34E5-02B0-40D5-B6D8-BFEA83E18B32}.Debug|Win32.ActiveCfg = Debug|Win32 {CBBD34E5-02B0-40D5-B6D8-BFEA83E18B32}.Debug|Win32.Build.0 = Debug|Win32 + {CBBD34E5-02B0-40D5-B6D8-BFEA83E18B32}.Debug|x64.ActiveCfg = Debug|x64 + {CBBD34E5-02B0-40D5-B6D8-BFEA83E18B32}.Debug|x64.Build.0 = Debug|x64 {CBBD34E5-02B0-40D5-B6D8-BFEA83E18B32}.Release|Win32.ActiveCfg = Release|Win32 {CBBD34E5-02B0-40D5-B6D8-BFEA83E18B32}.Release|Win32.Build.0 = Release|Win32 + {CBBD34E5-02B0-40D5-B6D8-BFEA83E18B32}.Release|x64.ActiveCfg = Release|x64 + {CBBD34E5-02B0-40D5-B6D8-BFEA83E18B32}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vsprojects/protoc.vcxproj b/vsprojects/protoc.vcxproj index ad2140fbb19cc..3bfd08aadbf70 100644 --- a/vsprojects/protoc.vcxproj +++ b/vsprojects/protoc.vcxproj @@ -1,27 +1,44 @@  - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {1738D5F6-ED1E-47E0-B2F0-456864B93C1E} Win32Proj + 8.1 Application - v120 + v140 + + + Application + v140 Application - v120 + v140 + + + Application + v140 @@ -29,22 +46,38 @@ + + + + + + <_ProjectFileVersion>12.0.30501.0 - Debug\ - $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ true + $(SolutionDir)$(Configuration)\$(Platform)\ + + + true + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ - Release\ - $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + true + $(SolutionDir)$(Configuration)\$(Platform)\ + + true + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ @@ -65,6 +98,24 @@ MachineX86 + + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions) + Disabled + ../src;.;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + true + Console + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions) @@ -83,6 +134,24 @@ MachineX86 + + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions) + ../src;.;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + true + Console + true + true + + diff --git a/vsprojects/test_plugin.vcxproj b/vsprojects/test_plugin.vcxproj index 358164273f1ef..947f5e278d92a 100644 --- a/vsprojects/test_plugin.vcxproj +++ b/vsprojects/test_plugin.vcxproj @@ -1,53 +1,92 @@  - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {CBBD34E5-02B0-40D5-B6D8-BFEA83E18B32} test_plugin Win32Proj + 8.1 Application - v120 + v140 + + + Application + v140 Application - v120 + v140 + + + Application + v140 - + + + + + + + - + + + + + + + <_ProjectFileVersion>12.0.30501.0 - Debug\ - $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ true + $(SolutionDir)$(Configuration)\$(Platform)\ + + + true + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ - Release\ - $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + true + $(SolutionDir)$(Configuration)\$(Platform)\ + + true + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ @@ -72,6 +111,30 @@ MachineX86 + + + + + + + + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions) + Disabled + ../src;.;../gtest/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + true + Console + + @@ -94,6 +157,30 @@ MachineX86 + + + + + + + + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions) + ../src;.;../gtest/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + true + Console + true + true + + diff --git a/vsprojects/tests.vcxproj b/vsprojects/tests.vcxproj index 1f4ec9ab75413..1285fe9ba7a39 100644 --- a/vsprojects/tests.vcxproj +++ b/vsprojects/tests.vcxproj @@ -1,53 +1,100 @@  - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {4DF72760-C055-40A5-A77E-30A17E2AC2DB} tests Win32Proj + 8.1 Application - v120 + v140 + + + Application + v140 Application - v120 + v140 + + + Application + v140 - + + + + + + + + + + + - + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 - Debug\ - $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ true + $(SolutionDir)$(Configuration)\$(Platform)\ + + + true + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ - Release\ - $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + true + $(SolutionDir)$(Configuration)\$(Platform)\ + + true + $(SolutionDir)$(Configuration)\$(Platform)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\$(Platform)\ @@ -72,6 +119,30 @@ MachineX86 + + + + + + + + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 /bigobj %(AdditionalOptions) + Disabled + ../src;.;../gtest/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + true + Console + + @@ -94,35 +165,77 @@ MachineX86 + + + + + + + + + /wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 %(AdditionalOptions) + ../src;.;../gtest/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;_VARIADIC_MAX=10;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + true + Console + true + true + + + + + + + + + + + + - + + + + + + + + + @@ -155,9 +268,10 @@ + + - @@ -166,6 +280,7 @@ + @@ -173,206 +288,297 @@ + + + - Generating cpp_test_bad_identifiers.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto - google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.h;google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.cc;%(Outputs) - Generating cpp_test_bad_identifiers.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto - google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.h;google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.cc;%(Outputs) - - - Generating map_lite_unittest.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/map_lite_unittest.proto - google\protobuf\map_lite_unittest.pb.h;google\protobuf\map_lite_unittest.pb.cc;%(Outputs) - Generating map_lite_unittest.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/map_lite_unittest.proto - google\protobuf\map_lite_unittest.pb.h;google\protobuf\map_lite_unittest.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating map_proto2_unittest.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/map_proto2_unittest.proto - google\protobuf\map_proto2_unittest.pb.h;google\protobuf\map_proto2_unittest.pb.cc;%(Outputs) - Generating map_proto2_unittest.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/map_proto2_unittest.proto - google\protobuf\map_proto2_unittest.pb.h;google\protobuf\map_proto2_unittest.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating map_unittest.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/map_unittest.proto - google\protobuf\map_unittest.pb.h;google\protobuf\map_unittest.pb.cc;%(Outputs) - Generating map_unittest.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/map_unittest.proto - google\protobuf\map_unittest.pb.h;google\protobuf\map_unittest.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest.proto - google\protobuf\unittest.pb.h;google\protobuf\unittest.pb.cc;%(Outputs) - Generating unittest.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest.proto - google\protobuf\unittest.pb.h;google\protobuf\unittest.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_arena.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_arena.proto - google\protobuf\unittest_arena.pb.h;google\protobuf\unittest_arena.pb.cc;%(Outputs) - Generating unittest_arena.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_arena.proto - google\protobuf\unittest_arena.pb.h;google\protobuf\unittest_arena.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_custom_options.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_custom_options.proto - google\protobuf\unittest_custom_options.pb.h;google\protobuf\unittest_custom_options.pb.cc;%(Outputs) - Generating unittest_custom_options.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_custom_options.proto - google\protobuf\unittest_custom_options.pb.h;google\protobuf\unittest_custom_options.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_drop_unknown_fields.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_drop_unknown_fields.proto - google\protobuf\unittest_drop_unknown_fields.pb.h;google\protobuf\unittest_drop_unknown_fields.pb.cc;%(Outputs) - Generating unittest_drop_unknown_fields.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_drop_unknown_fields.proto - google\protobuf\unittest_drop_unknown_fields.pb.h;google\protobuf\unittest_drop_unknown_fields.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_embed_optimize_for.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_embed_optimize_for.proto - google\protobuf\unittest_embed_optimize_for.pb.h;google\protobuf\unittest_embed_optimize_for.pb.cc;%(Outputs) - Generating unittest_embed_optimize_for.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_embed_optimize_for.proto - google\protobuf\unittest_embed_optimize_for.pb.h;google\protobuf\unittest_embed_optimize_for.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_empty.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_empty.proto - google\protobuf\unittest_empty.pb.h;google\protobuf\unittest_empty.pb.cc;%(Outputs) - Generating unittest_empty.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_empty.proto - google\protobuf\unittest_empty.pb.h;google\protobuf\unittest_empty.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_import.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import.proto - google\protobuf\unittest_import.pb.h;google\protobuf\unittest_import.pb.cc;%(Outputs) - Generating unittest_import.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import.proto - google\protobuf\unittest_import.pb.h;google\protobuf\unittest_import.pb.cc;%(Outputs) - - - Generating unittest_import_lite.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_lite.proto - google\protobuf\unittest_import_lite.pb.h;google\protobuf\unittest_import_lite.pb.cc;%(Outputs) - Generating unittest_import_lite.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_lite.proto - google\protobuf\unittest_import_lite.pb.h;google\protobuf\unittest_import_lite.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_import_public.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_public.proto - google\protobuf\unittest_import_public.pb.h;google\protobuf\unittest_import_public.pb.cc;%(Outputs) - Generating unittest_import_public.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_public.proto - google\protobuf\unittest_import_public.pb.h;google\protobuf\unittest_import_public.pb.cc;%(Outputs) - - - Generating unittest_import_public_lite.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_public_lite.proto - google\protobuf\unittest_import_public_lite.pb.h;google\protobuf\unittest_import_public_lite.pb.cc;%(Outputs) - Generating unittest_import_public_lite.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_public_lite.proto - google\protobuf\unittest_import_public_lite.pb.h;google\protobuf\unittest_import_public_lite.pb.cc;%(Outputs) - - - Generating unittest_lite.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite.proto - google\protobuf\unittest_lite.pb.h;google\protobuf\unittest_lite.pb.cc;%(Outputs) - Generating unittest_lite.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite.proto - google\protobuf\unittest_lite.pb.h;google\protobuf\unittest_lite.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_lite_imports_nonlite.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite_imports_nonlite.proto - google\protobuf\unittest_lite_imports_nonlite.pb.h;google\protobuf\unittest_lite_imports_nonlite.pb.cc;%(Outputs) - Generating unittest_lite_imports_nonlite.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite_imports_nonlite.proto - google\protobuf\unittest_lite_imports_nonlite.pb.h;google\protobuf\unittest_lite_imports_nonlite.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_mset.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_mset.proto - google\protobuf\unittest_mset.pb.h;google\protobuf\unittest_mset.pb.cc;%(Outputs) - Generating unittest_mset.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_mset.proto - google\protobuf\unittest_mset.pb.h;google\protobuf\unittest_mset.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_no_arena.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_arena.proto - google\protobuf\unittest_no_arena.pb.h;google\protobuf\unittest_no_arena.pb.cc;%(Outputs) - Generating unittest_no_arena.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_arena.proto - google\protobuf\unittest_no_arena.pb.h;google\protobuf\unittest_no_arena.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_no_arena_import.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_arena_import.proto - google\protobuf\unittest_no_arena_import.pb.h;google\protobuf\unittest_no_arena_import.pb.cc;%(Outputs) - Generating unittest_no_arena_import.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_arena_import.proto - google\protobuf\unittest_no_arena_import.pb.h;google\protobuf\unittest_no_arena_import.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_no_field_presence.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_field_presence.proto - google\protobuf\unittest_no_field_presence.pb.h;google\protobuf\unittest_no_field_presence.pb.cc;%(Outputs) - Generating unittest_no_field_presence.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_field_presence.proto - google\protobuf\unittest_no_field_presence.pb.h;google\protobuf\unittest_no_field_presence.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_no_generic_services.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_generic_services.proto - google\protobuf\unittest_no_generic_services.pb.h;google\protobuf\unittest_no_generic_services.pb.cc;%(Outputs) - Generating unittest_no_generic_services.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_generic_services.proto - google\protobuf\unittest_no_generic_services.pb.h;google\protobuf\unittest_no_generic_services.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_optimize_for.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_optimize_for.proto - google\protobuf\unittest_optimize_for.pb.h;google\protobuf\unittest_optimize_for.pb.cc;%(Outputs) - Generating unittest_optimize_for.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_optimize_for.proto - google\protobuf\unittest_optimize_for.pb.h;google\protobuf\unittest_optimize_for.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_preserve_unknown_enum.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_preserve_unknown_enum.proto - google\protobuf\unittest_preserve_unknown_enum.pb.h;google\protobuf\unittest_preserve_unknown_enum.pb.cc;%(Outputs) - Generating unittest_preserve_unknown_enum.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_preserve_unknown_enum.proto - google\protobuf\unittest_preserve_unknown_enum.pb.h;google\protobuf\unittest_preserve_unknown_enum.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) - Generating unittest_proto3_arena.pb.{h,cc}... - Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_proto3_arena.proto - google\protobuf\unittest_proto3_arena.pb.h;google\protobuf\unittest_proto3_arena.pb.cc;%(Outputs) - Generating unittest_proto3_arena.pb.{h,cc}... - Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_proto3_arena.proto - google\protobuf\unittest_proto3_arena.pb.h;google\protobuf\unittest_proto3_arena.pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) @@ -385,6 +591,87 @@ false + + + Document + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + + + Document + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + + + Document + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + + + + + + + + + Document + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + + + + + + Document + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + "$(OutDir)protoc" -I..\src --cpp_out=. "%(Identity)" + Generating C++ files for %(FullPath) + Generating C++ files for %(FullPath) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + %(Directory)%(Filename).pb.h;%(Directory)%(Filename).pb.cc;%(Outputs) + + + diff --git a/vsprojects/tests.vcxproj.filters b/vsprojects/tests.vcxproj.filters index e0445e614e9a5..64f6a8928ddcc 100644 --- a/vsprojects/tests.vcxproj.filters +++ b/vsprojects/tests.vcxproj.filters @@ -45,9 +45,6 @@ Header Files - - Header Files - Header Files @@ -57,6 +54,48 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + @@ -197,9 +236,6 @@ Source Files - - Source Files - Source Files @@ -266,9 +302,41 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + - @@ -277,12 +345,9 @@ - - - @@ -292,5 +357,20 @@ + + + + + + + + + + + + + + + \ No newline at end of file