update proto links (#3380)
repo moved, see https://github.com/protocolbuffers/protobuf/issues/4796
This commit is contained in:
parent
3605a2ca0e
commit
8b567427c2
3 changed files with 3 additions and 3 deletions
|
@ -69,7 +69,7 @@ install:
|
||||||
if (Test-Path c:\protobuf-release) {
|
if (Test-Path c:\protobuf-release) {
|
||||||
echo "using protobuf from cache"
|
echo "using protobuf from cache"
|
||||||
} else {
|
} else {
|
||||||
Invoke-WebRequest "https://github.com/google/protobuf/releases/download/v$env:protobuf_ver/protobuf-cpp-$env:protobuf_ver.zip" -OutFile c:\protobuf-cpp-$env:protobuf_ver.zip
|
Invoke-WebRequest "https://github.com/protocolbuffers/protobuf/releases/download/v$env:protobuf_ver/protobuf-cpp-$env:protobuf_ver.zip" -OutFile c:\protobuf-cpp-$env:protobuf_ver.zip
|
||||||
Expand-Archive -Path c:\protobuf-cpp-$env:protobuf_ver.zip -DestinationPath c:\
|
Expand-Archive -Path c:\protobuf-cpp-$env:protobuf_ver.zip -DestinationPath c:\
|
||||||
Set-Location -Path C:\protobuf-$env:protobuf_ver\cmake
|
Set-Location -Path C:\protobuf-$env:protobuf_ver\cmake
|
||||||
cmake . -G "$env:cmake_generator" -T "$env:cmake_toolset" -Dprotobuf_BUILD_TESTS=0 -Dprotobuf_MSVC_STATIC_RUNTIME=0 -DCMAKE_INSTALL_PREFIX=c:/protobuf-release
|
cmake . -G "$env:cmake_generator" -T "$env:cmake_toolset" -Dprotobuf_BUILD_TESTS=0 -Dprotobuf_MSVC_STATIC_RUNTIME=0 -DCMAKE_INSTALL_PREFIX=c:/protobuf-release
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#ifdef Q_OS_OSX
|
#ifdef Q_OS_OSX
|
||||||
// avoid collision from Mac OS X's ConditionalMacros.h
|
// avoid collision from Mac OS X's ConditionalMacros.h
|
||||||
// https://code.google.com/p/protobuf/issues/detail?id=119
|
// https://github.com/protocolbuffers/protobuf/issues/119
|
||||||
#undef TYPE_BOOL
|
#undef TYPE_BOOL
|
||||||
#endif
|
#endif
|
||||||
#include "pb/event_room_say.pb.h"
|
#include "pb/event_room_say.pb.h"
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#ifdef Q_OS_OSX
|
#ifdef Q_OS_OSX
|
||||||
// avoid collision from Mac OS X's ConditionalMacros.h
|
// avoid collision from Mac OS X's ConditionalMacros.h
|
||||||
// https://code.google.com/p/protobuf/issues/detail?id=119
|
// https://github.com/protocolbuffers/protobuf/issues/119
|
||||||
#undef TYPE_BOOL
|
#undef TYPE_BOOL
|
||||||
#endif
|
#endif
|
||||||
#include "pb/serverinfo_user.pb.h"
|
#include "pb/serverinfo_user.pb.h"
|
||||||
|
|
Loading…
Reference in a new issue