Skip to content

Commit

Permalink
Merge branch 'master' into partner
Browse files Browse the repository at this point in the history
  • Loading branch information
zpostfacto committed Mar 14, 2024
2 parents 65adb78 + 7aadb55 commit 408703f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
4 changes: 2 additions & 2 deletions BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ Building
* Visual Studio 2017 or later
* One of the following crypto solutions:
* OpenSSL 1.1.1 or later
* libsodium
* libsodium (can cause issues on Intel machines with AES-NI disabled see [here](https://github.com/ValveSoftware/GameNetworkingSockets/issues/243))
* [bcrypt](https://docs.microsoft.com/en-us/windows/desktop/api/bcrypt/)
(Windows only. Note the primary reason this is supported is to satisfy
an Xbox requuirement.)
an Xbox requirement.)
* Google protobuf 2.6.1+
* Google [webrtc](https://opensource.google/projects/webrtc) is used for
NAT piercing (ICE) for P2P connections. The relevant code is linked in as a
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ Third party language bindings:
* <https://github.com/Facepunch/Facepunch.Steamworks>
* Go:
* <https://github.com/nielsAD/gns/>
* Rust:
* <https://github.com/hussein-aitlahcen/gns-rs>

## Why do I see "Steam" everywhere?

Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ set(GNS_COMMON_SRCS
"steamnetworkingsockets/steamnetworkingsockets_shared.cpp"
"tier0/dbg.cpp"
"tier0/platformtime.cpp"
"tier0/valve_tracelogging.cpp"
"tier1/netadr.cpp"
"tier1/utlbuffer.cpp"
"tier1/utlmemory.cpp"
Expand Down

0 comments on commit 408703f

Please sign in to comment.