diff options
author | xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-09-24 06:48:20 +0000 |
---|---|---|
committer | xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-09-24 06:48:20 +0000 |
commit | fcb8a50b5017673a90dd9d7eef9999a101151c30 (patch) | |
tree | 8bc7283f6bdbde32d600eb707d41be7ef742db4e /vsprojects | |
parent | b55a20fa2c669b181f47ea9219b8e74d1263da19 (diff) | |
download | protobuf-fcb8a50b5017673a90dd9d7eef9999a101151c30.tar.gz protobuf-fcb8a50b5017673a90dd9d7eef9999a101151c30.tar.bz2 protobuf-fcb8a50b5017673a90dd9d7eef9999a101151c30.zip |
Update MSVC project files and fix compilation issues in MSVC.
Diffstat (limited to 'vsprojects')
-rwxr-xr-x | vsprojects/extract_includes.bat | 1 | ||||
-rw-r--r-- | vsprojects/libprotobuf-lite.vcproj | 18 | ||||
-rw-r--r-- | vsprojects/libprotobuf.vcproj | 18 | ||||
-rw-r--r-- | vsprojects/libprotoc.vcproj | 12 | ||||
-rw-r--r-- | vsprojects/lite-test.vcproj | 32 | ||||
-rw-r--r-- | vsprojects/tests.vcproj | 56 |
6 files changed, 135 insertions, 2 deletions
diff --git a/vsprojects/extract_includes.bat b/vsprojects/extract_includes.bat index 4f11dfd0..f4852554 100755 --- a/vsprojects/extract_includes.bat +++ b/vsprojects/extract_includes.bat @@ -17,6 +17,7 @@ copy ..\src\google\protobuf\descriptor.pb.h include\google\protobuf\descriptor.p copy ..\src\google\protobuf\descriptor_database.h include\google\protobuf\descriptor_database.h copy ..\src\google\protobuf\dynamic_message.h include\google\protobuf\dynamic_message.h copy ..\src\google\protobuf\extension_set.h include\google\protobuf\extension_set.h +copy ..\src\google\protobuf\generated_enum_reflection.h include\google\protobuf\generated_enum_reflection.h copy ..\src\google\protobuf\generated_message_util.h include\google\protobuf\generated_message_util.h copy ..\src\google\protobuf\generated_message_reflection.h include\google\protobuf\generated_message_reflection.h copy ..\src\google\protobuf\message.h include\google\protobuf\message.h diff --git a/vsprojects/libprotobuf-lite.vcproj b/vsprojects/libprotobuf-lite.vcproj index 1f959894..06b15988 100644 --- a/vsprojects/libprotobuf-lite.vcproj +++ b/vsprojects/libprotobuf-lite.vcproj @@ -204,7 +204,7 @@ > </File> <File - RelativePath="..\src\google\protobuf\stubs\stl_util-inl.h" + RelativePath="..\src\google\protobuf\stubs\stl_util.h" > </File> <File @@ -223,6 +223,18 @@ RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.h" > </File> + <File + RelativePath="..\src\google\protobuf\stubs\stringprintf.h" + > + </File> + <File + RelativePath="..\src\google\protobuf\stubs\template_util.h" + > + </File> + <File + RelativePath="..\src\google\protobuf\stubs\type_traits.h" + > + </File> </Filter> <Filter Name="Resource Files" @@ -279,6 +291,10 @@ RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.cc" > </File> + <File + RelativePath="..\src\google\protobuf\stubs\stringprintf.cc" + > + </File> </Filter> </Files> <Globals> diff --git a/vsprojects/libprotobuf.vcproj b/vsprojects/libprotobuf.vcproj index c87c30b2..fd47753d 100644 --- a/vsprojects/libprotobuf.vcproj +++ b/vsprojects/libprotobuf.vcproj @@ -252,7 +252,19 @@ > </File> <File - RelativePath="..\src\google\protobuf\stubs\stl_util-inl.h" + RelativePath="..\src\google\protobuf\stubs\stl_util.h" + > + </File> + <File + RelativePath="..\src\google\protobuf\stubs\stringprintf.h" + > + </File> + <File + RelativePath="..\src\google\protobuf\stubs\template_util.h" + > + </File> + <File + RelativePath="..\src\google\protobuf\stubs\type_traits.h" > </File> <File @@ -439,6 +451,10 @@ RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.cc" > </File> + <File + RelativePath="..\src\google\protobuf\stubs\stringprintf.cc" + > + </File> </Filter> </Files> <Globals> diff --git a/vsprojects/libprotoc.vcproj b/vsprojects/libprotoc.vcproj index d55e24e0..b7030288 100644 --- a/vsprojects/libprotoc.vcproj +++ b/vsprojects/libprotoc.vcproj @@ -208,6 +208,10 @@ > </File> <File + RelativePath="..\src\google\protobuf\compiler\cpp\cpp_options.h" + > + </File> + <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_primitive_field.h" > </File> @@ -268,6 +272,14 @@ > </File> <File + RelativePath="..\src\google\protobuf\compiler\java\java_doc_comment.h" + > + </File> + <File + RelativePath="..\src\google\protobuf\compiler\java\java_doc_comment.cc" + > + </File> + <File RelativePath="..\src\google\protobuf\compiler\python\python_generator.h" > </File> diff --git a/vsprojects/lite-test.vcproj b/vsprojects/lite-test.vcproj index f66556ab..8020a500 100644 --- a/vsprojects/lite-test.vcproj +++ b/vsprojects/lite-test.vcproj @@ -190,6 +190,10 @@ RelativePath=".\google\protobuf\unittest_import_lite.pb.h" > </File> + <File + RelativePath=".\google\protobuf\unittest_import_public_lite.pb.h" + > + </File> </Filter> <Filter Name="Resource Files" @@ -218,6 +222,10 @@ RelativePath=".\google\protobuf\unittest_import_lite.pb.cc" > </File> + <File + RelativePath=".\google\protobuf\unittest_import_public_lite.pb.cc" + > + </File> </Filter> <File RelativePath="..\src\google\protobuf\unittest_lite.proto" @@ -267,6 +275,30 @@ /> </FileConfiguration> </File> + <File + RelativePath="..\src\google\protobuf\unittest_import_public_lite.proto" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Generating unittest_import_public_lite.pb.{h,cc}..." + CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_public_lite.proto
" + Outputs="google\protobuf\unittest_import_public_lite.pb.h;google\protobuf\unittest_import_public_lite.pb.cc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Generating unittest_import_public_lite.pb.{h,cc}..." + CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_public_lite.proto
" + Outputs="google\protobuf\unittest_import_public_lite.pb.h;google\protobuf\unittest_import_public_lite.pb.cc" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> diff --git a/vsprojects/tests.vcproj b/vsprojects/tests.vcproj index 6df659ae..fb815b5a 100644 --- a/vsprojects/tests.vcproj +++ b/vsprojects/tests.vcproj @@ -215,6 +215,10 @@ > </File> <File + RelativePath=".\google\protobuf\unittest_import_public.pb.h" + > + </File> + <File RelativePath=".\google\protobuf\unittest_lite_imports_nonline.pb.h" > </File> @@ -263,6 +267,10 @@ > </File> <File + RelativePath="..\src\google\protobuf\compiler\cpp\cpp_unittest.cc" + > + </File> + <File RelativePath=".\google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.cc" > </File> @@ -279,6 +287,10 @@ > </File> <File + RelativePath="..\src\google\protobuf\compiler\java\java_doc_comment_unittest.cc" + > + </File> + <File RelativePath="..\src\google\protobuf\compiler\python\python_plugin_unittest.cc" > </File> @@ -339,10 +351,26 @@ > </File> <File + RelativePath="..\src\google\protobuf\repeated_field_reflection_unittest.cc" + > + </File> + <File RelativePath="..\src\google\protobuf\stubs\structurally_valid_unittest.cc" > </File> <File + RelativePath="..\src\google\protobuf\stubs\stringprintf_unittest.cc" + > + </File> + <File + RelativePath="..\src\google\protobuf\stubs\template_util_unittest.cc" + > + </File> + <File + RelativePath="..\src\google\protobuf\stubs\type_traits_unittest.cc" + > + </File> + <File RelativePath="..\src\google\protobuf\stubs\strutil_unittest.cc" > </File> @@ -375,6 +403,10 @@ > </File> <File + RelativePath=".\google\protobuf\unittest_import_public.pb.cc" + > + </File> + <File RelativePath=".\google\protobuf\unittest_lite_imports_nonlite.pb.cc" > </File> @@ -524,6 +556,30 @@ </FileConfiguration> </File> <File + RelativePath="..\src\google\protobuf\unittest_import_public.proto" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Generating unittest_import_public.pb.{h,cc}..." + CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_public.proto
" + Outputs="google\protobuf\unittest_import_public.pb.h;google\protobuf\unittest_import_public.pb.cc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Generating unittest_import_public.pb.{h,cc}..." + CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_public.proto
" + Outputs="google\protobuf\unittest_import_public.pb.h;google\protobuf\unittest_import_public.pb.cc" + /> + </FileConfiguration> + </File> + <File RelativePath="..\src\google\protobuf\unittest_lite_imports_nonlite.proto" > <FileConfiguration |