Rebuild protobuf with VS2010 to fix debug info.
authormark <mark@2c67d6c2-4361-4cd7-bd83-1149b1926c9b>
Wed, 28 Aug 2013 19:14:58 +0000 (19:14 +0000)
committermark <mark@2c67d6c2-4361-4cd7-bd83-1149b1926c9b>
Wed, 28 Aug 2013 19:14:58 +0000 (19:14 +0000)
Use /Z7 format to avoid LNK4099 errors when linking to the static libraries.

git-svn-id: https://valelab.ucsf.edu/svn/3rdpartypublic@147 2c67d6c2-4361-4cd7-bd83-1149b1926c9b

14 files changed:
google/protobuf-2.5.0_build/VS2010/bin/protoc.exe
google/protobuf-2.5.0_build/VS2010/lib/Debug/Win32/libprotobuf-lite.lib
google/protobuf-2.5.0_build/VS2010/lib/Debug/Win32/libprotobuf.lib
google/protobuf-2.5.0_build/VS2010/lib/Debug/Win32/libprotoc.lib
google/protobuf-2.5.0_build/VS2010/lib/Debug/x64/libprotobuf-lite.lib
google/protobuf-2.5.0_build/VS2010/lib/Debug/x64/libprotobuf.lib
google/protobuf-2.5.0_build/VS2010/lib/Debug/x64/libprotoc.lib
google/protobuf-2.5.0_build/VS2010/lib/Release/Win32/libprotobuf-lite.lib
google/protobuf-2.5.0_build/VS2010/lib/Release/Win32/libprotobuf.lib
google/protobuf-2.5.0_build/VS2010/lib/Release/Win32/libprotoc.lib
google/protobuf-2.5.0_build/VS2010/lib/Release/x64/libprotobuf-lite.lib
google/protobuf-2.5.0_build/VS2010/lib/Release/x64/libprotobuf.lib
google/protobuf-2.5.0_build/VS2010/lib/Release/x64/libprotoc.lib
google/protobuf-2.5.0_build/readme.txt

index 37703c2..18639c0 100644 (file)
Binary files a/google/protobuf-2.5.0_build/VS2010/bin/protoc.exe and b/google/protobuf-2.5.0_build/VS2010/bin/protoc.exe differ
index 1896773..06acb6b 100644 (file)
Binary files a/google/protobuf-2.5.0_build/VS2010/lib/Debug/Win32/libprotobuf-lite.lib and b/google/protobuf-2.5.0_build/VS2010/lib/Debug/Win32/libprotobuf-lite.lib differ
index 04e257d..e6af04c 100644 (file)
Binary files a/google/protobuf-2.5.0_build/VS2010/lib/Debug/Win32/libprotobuf.lib and b/google/protobuf-2.5.0_build/VS2010/lib/Debug/Win32/libprotobuf.lib differ
index f0df360..ffd7fd6 100644 (file)
Binary files a/google/protobuf-2.5.0_build/VS2010/lib/Debug/Win32/libprotoc.lib and b/google/protobuf-2.5.0_build/VS2010/lib/Debug/Win32/libprotoc.lib differ
index 075ddff..4f56fc4 100644 (file)
Binary files a/google/protobuf-2.5.0_build/VS2010/lib/Debug/x64/libprotobuf-lite.lib and b/google/protobuf-2.5.0_build/VS2010/lib/Debug/x64/libprotobuf-lite.lib differ
index 6e37713..65c2cd4 100644 (file)
Binary files a/google/protobuf-2.5.0_build/VS2010/lib/Debug/x64/libprotobuf.lib and b/google/protobuf-2.5.0_build/VS2010/lib/Debug/x64/libprotobuf.lib differ
index ec859d4..3733178 100644 (file)
Binary files a/google/protobuf-2.5.0_build/VS2010/lib/Debug/x64/libprotoc.lib and b/google/protobuf-2.5.0_build/VS2010/lib/Debug/x64/libprotoc.lib differ
index d5d9f06..36bb62b 100644 (file)
Binary files a/google/protobuf-2.5.0_build/VS2010/lib/Release/Win32/libprotobuf-lite.lib and b/google/protobuf-2.5.0_build/VS2010/lib/Release/Win32/libprotobuf-lite.lib differ
index edb1f75..bc4f9e1 100644 (file)
Binary files a/google/protobuf-2.5.0_build/VS2010/lib/Release/Win32/libprotobuf.lib and b/google/protobuf-2.5.0_build/VS2010/lib/Release/Win32/libprotobuf.lib differ
index 9a08626..2966024 100644 (file)
Binary files a/google/protobuf-2.5.0_build/VS2010/lib/Release/Win32/libprotoc.lib and b/google/protobuf-2.5.0_build/VS2010/lib/Release/Win32/libprotoc.lib differ
index 908be46..fa18c76 100644 (file)
Binary files a/google/protobuf-2.5.0_build/VS2010/lib/Release/x64/libprotobuf-lite.lib and b/google/protobuf-2.5.0_build/VS2010/lib/Release/x64/libprotobuf-lite.lib differ
index 1ca06e2..5d8c07b 100644 (file)
Binary files a/google/protobuf-2.5.0_build/VS2010/lib/Release/x64/libprotobuf.lib and b/google/protobuf-2.5.0_build/VS2010/lib/Release/x64/libprotobuf.lib differ
index 65ad8a7..2a4fa85 100644 (file)
Binary files a/google/protobuf-2.5.0_build/VS2010/lib/Release/x64/libprotoc.lib and b/google/protobuf-2.5.0_build/VS2010/lib/Release/x64/libprotoc.lib differ
index c7347aa..1b1aa10 100644 (file)
@@ -14,6 +14,9 @@ No further settings need to be changed (although the output will go to the same
 directory as the Win32 by default, so perhaps add $(Platform) to the output\r
 directory).\r
 \r
+Since we are producing static libraries, it is best to set C/C++ > General >\r
+Debug Information Format to /Z7, to prevent LNK4099 warnings.\r
+\r
 To build from the Visual Studio command line:\r
 msbuild /p:Configuration=Debug /p:Platform=Win32 protobuf.sln\r
 msbuild /p:Configuration=Release /p:Platform=Win32 protobuf.sln\r