diff options
| author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2008-09-30 00:09:40 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2008-09-30 00:09:40 +0000 |
| commit | 9b10f5845aabc791e2fef0e5a11656ca01cd7813 (patch) | |
| tree | 63fdebf8dd5893de95d6470d000cd60e3a1a3c9c /vsprojects/tests.vcproj | |
| parent | 0b3023fa6561f3b5abe43ac9e20d0ede43a56737 (diff) | |
| download | protobuf-9b10f5845aabc791e2fef0e5a11656ca01cd7813.tar.gz protobuf-9b10f5845aabc791e2fef0e5a11656ca01cd7813.tar.bz2 protobuf-9b10f5845aabc791e2fef0e5a11656ca01cd7813.zip | |
* Fix build on MSVC.
* Switch to statically-linked libraries instead of DLLs on MSVC.
Diffstat (limited to 'vsprojects/tests.vcproj')
| -rw-r--r-- | vsprojects/tests.vcproj | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/vsprojects/tests.vcproj b/vsprojects/tests.vcproj index 9530557b..41480163 100644 --- a/vsprojects/tests.vcproj +++ b/vsprojects/tests.vcproj @@ -262,6 +262,10 @@ RelativePath=".\google\protobuf\unittest_embed_optimize_for.pb.h" > </File> + <File + RelativePath=".\google\protobuf\unittest_custom_options.pb.h" + > + </File> </Filter> <Filter Name="Resource Files" @@ -407,6 +411,10 @@ > </File> <File + RelativePath=".\google\protobuf\unittest_custom_options.pb.cc" + > + </File> + <File RelativePath="..\src\google\protobuf\unknown_field_set_unittest.cc" > </File> @@ -563,6 +571,30 @@ /> </FileConfiguration> </File> + <File + RelativePath="..\src\google\protobuf\unittest_custom_options.proto" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Generating unittest_custom_options.pb.{h,cc}..." + CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_custom_options.proto
" + Outputs="google\protobuf\unittest_custom_options.pb.h;google\protobuf\unittest_custom_options.pb.cc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Generating unittest_custom_options.pb.{h,cc}..." + CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_custom_options.proto
" + Outputs="google\protobuf\unittest_custom_options.pb.h;google\protobuf\unittest_custom_options.pb.cc" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> |