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/test_plugin.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/test_plugin.vcproj')
| -rwxr-xr-x | vsprojects/test_plugin.vcproj | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/vsprojects/test_plugin.vcproj b/vsprojects/test_plugin.vcproj index cfe387f..2dcf2ad 100755 --- a/vsprojects/test_plugin.vcproj +++ b/vsprojects/test_plugin.vcproj @@ -1,20 +1,20 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="test_plugin"
- ProjectGUID="{CBBD34E5-02B0-40D5-B6D8-BFEA83E18B32}"
- RootNamespace="test_plugin"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
+<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="test_plugin" + ProjectGUID="{CBBD34E5-02B0-40D5-B6D8-BFEA83E18B32}" + RootNamespace="test_plugin" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" @@ -46,7 +46,7 @@ AdditionalOptions="/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305" Optimization="0" AdditionalIncludeDirectories="../src;.;../gtest/include" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_VARIADIC_MAX=10;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -122,7 +122,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305" AdditionalIncludeDirectories="../src;.;../gtest/include" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_VARIADIC_MAX=10;" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" |