diff options
| author | Jeff Davidson <jpd@google.com> | 2014-09-15 16:29:06 -0700 |
|---|---|---|
| committer | Jeff Davidson <jpd@google.com> | 2015-01-15 14:10:53 -0800 |
| commit | a3b2a6da25a76f17c73d31def3952feb0fd2296e (patch) | |
| tree | 586f7d5e9a7e05af45d0e821188097c0faa96219 /vsprojects/libprotobuf.vcproj | |
| parent | c7c25812eb19d080087b71e08bfe35aff9f21433 (diff) | |
| download | external_protobuf-a3b2a6da25a76f17c73d31def3952feb0fd2296e.zip external_protobuf-a3b2a6da25a76f17c73d31def3952feb0fd2296e.tar.gz external_protobuf-a3b2a6da25a76f17c73d31def3952feb0fd2296e.tar.bz2 | |
Update protobuf library from 2.3 to 2.6.
Copied in all files from the open source protobuf project at commit
edc5994525c79cd1919859a370837a6ff7c8e308, removing files which have
been renamed (COPYING.txt -> LICENSE, README.txt -> README.md).
Removed 2.3 prebuilts, which is an approach that will not work due to
incompatibility with the 2.6 runtime.
Merged in micro/nano-specific changes in the following files:
-Android.mk - updated list of C++/Java sources, bumped versions
-java/README.txt - merged in micro/nano instructions, bumped versions
-java/pom.xml - merged in micro/nano build rules, set packaging to jar
-src/Makefile.am - merged in references to micro/nano generators
-src/google/protobuf/compiler/javamicro/javamicro_file.h - imported
google/protobuf/compiler/code_generator.h and removed redundant
OutputDirectory class.
-src/google/protobuf/compiler/javanano/javanano_file.h - same
-Replaced instances of vector with std::vector as needed to get
libprotobuf-cpp-full to compile. Plan to upstream this fix per
discussion with protobuf maintainers.
Reran autogen.sh to update ./configure and associated scripts.
Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
Diffstat (limited to 'vsprojects/libprotobuf.vcproj')
| -rw-r--r-- | vsprojects/libprotobuf.vcproj | 46 |
1 files changed, 41 insertions, 5 deletions
diff --git a/vsprojects/libprotobuf.vcproj b/vsprojects/libprotobuf.vcproj index 7b8111f..1a488f7 100644 --- a/vsprojects/libprotobuf.vcproj +++ b/vsprojects/libprotobuf.vcproj @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <VisualStudioProject ProjectType="Visual C++" - Version="8.00" + Version="9.00" Name="libprotobuf" ProjectGUID="{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}" Keyword="Win32Proj" @@ -196,6 +196,10 @@ > </File> <File + RelativePath="..\src\google\protobuf\io\strtod.h" + > + </File> + <File RelativePath="..\src\google\protobuf\stubs\hash.h" > </File> @@ -204,7 +208,7 @@ > </File> <File - RelativePath="..\src\google\protobuf\stubs\map-util.h" + RelativePath="..\src\google\protobuf\stubs\map_util.h" > </File> <File @@ -216,6 +220,18 @@ > </File> <File + RelativePath="..\src\google\protobuf\stubs\atomicops.h" + > + </File> + <File + RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.h" + > + </File> + <File + RelativePath="..\src\google\protobuf\stubs\platform_macros.h" + > + </File> + <File RelativePath="..\src\google\protobuf\stubs\once.h" > </File> @@ -240,7 +256,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 @@ -344,7 +372,7 @@ > </File> <File - RelativePath="..\src\google\protobuf\stubs\hash.cc" + RelativePath="..\src\google\protobuf\io\strtod.cc" > </File> <File @@ -364,6 +392,10 @@ > </File> <File + RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.cc" + > + </File> + <File RelativePath="..\src\google\protobuf\compiler\parser.cc" > </File> @@ -427,6 +459,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> |