Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update nethook to protobuf-2.6.1 #965

Merged
merged 1 commit into from
Mar 22, 2021
Merged

Update nethook to protobuf-2.6.1 #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Resources/NetHook2/BuildDependencies.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ if not exist "native-dependencies\zlib-bins\ALL_BUILD.vcxproj" (

msbuild native-dependencies\zlib-bins\ALL_BUILD.vcxproj /p:Configuration=Release

if not exist "native-dependencies\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj" (
devenv /upgrade native-dependencies\protobuf-2.5.0\vsprojects\protobuf.sln
if not exist "native-dependencies\protobuf-2.6.1\vsprojects\libprotobuf.vcxproj" (
devenv /upgrade native-dependencies\protobuf-2.6.1\vsprojects\protobuf.sln
)

if not exist "native-dependencies\protobuf-2.5.0\vsprojects\Directory.Build.props" (
copy protobuf-Directory.Build.props native-dependencies\protobuf-2.5.0\vsprojects\Directory.Build.props
if not exist "native-dependencies\protobuf-2.6.1\vsprojects\Directory.Build.props" (
copy protobuf-Directory.Build.props native-dependencies\protobuf-2.6.1\vsprojects\Directory.Build.props
)

msbuild native-dependencies\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj /p:Configuration=Debug
msbuild native-dependencies\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj /p:Configuration=Release
msbuild native-dependencies\protobuf-2.6.1\vsprojects\libprotobuf.vcxproj /p:Configuration=Debug
msbuild native-dependencies\protobuf-2.6.1\vsprojects\libprotobuf.vcxproj /p:Configuration=Release

rem todo: compile protoc and generate steammessages_base.pb.{h|cpp}

Expand Down
7 changes: 4 additions & 3 deletions Resources/NetHook2/InstallDependencies.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ $NetHook2DependenciesTemporaryDirectory = Join-Path ([System.IO.Path]::GetTempPa
$ZLibSourceZipUrl = "http://zlib.net/zlib1211.zip"
$ZLibSourceFile = [System.IO.Path]::Combine($NetHook2DependenciesTemporaryDirectory, "zlib-1.2.11.zip")
$ZLibSourceInnerFolderName = "zlib-1.2.11"
$ProtobufSourceZipUrl = "https://github.com/google/protobuf/releases/download/v2.5.0/protobuf-2.5.0.zip"
$ProtobufSourceFile = [System.IO.Path]::Combine($NetHook2DependenciesTemporaryDirectory, "protobuf-2.5.0.zip")
$ProtobufSourceInnerFolderName = "protobuf-2.5.0"
$ProtobufVersion = "2.6.1"
$ProtobufSourceZipUrl = "https://github.com/google/protobuf/releases/download/v$ProtobufVersion/protobuf-$ProtobufVersion.zip"
$ProtobufSourceFile = [System.IO.Path]::Combine($NetHook2DependenciesTemporaryDirectory, "protobuf-$ProtobufVersion.zip")
$ProtobufSourceInnerFolderName = "protobuf-$ProtobufVersion"

Set-Location $PSScriptRoot

Expand Down
2 changes: 1 addition & 1 deletion Resources/NetHook2/NetHook2/NetHook2.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<ZLibVersion>1.2.11</ZLibVersion>
<ProtobufVersion>2.5.0</ProtobufVersion>
<ProtobufVersion>2.6.1</ProtobufVersion>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
Expand Down
Loading