diff options
| author | 2022-07-25 18:31:45 -0400 | |
|---|---|---|
| committer | 2022-07-25 18:31:45 -0400 | |
| commit | 1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2 (patch) | |
| tree | 999411f1ca76390654d1034c6d0bd2c47c3f101c /externals | |
| parent | Merge pull request #8564 from lat9nq/dinner-fork (diff) | |
| parent | network: Address review comments (diff) | |
| download | yuzu-1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2.tar.gz yuzu-1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2.tar.xz yuzu-1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2.zip | |
Merge pull request #8541 from FearlessTobi/multiplayer-part1
yuzu, network: Add room service and UI configuration
Diffstat (limited to '')
| -rw-r--r-- | externals/CMakeLists.txt | 9 | ||||
| m--------- | externals/cpp-jwt | 0 | ||||
| m--------- | externals/enet | 0 |
3 files changed, 9 insertions, 0 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index bd01f4c4d..5b74a1773 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt | |||
| @@ -73,6 +73,10 @@ if (YUZU_USE_EXTERNAL_SDL2) | |||
| 73 | add_library(SDL2 ALIAS SDL2-static) | 73 | add_library(SDL2 ALIAS SDL2-static) |
| 74 | endif() | 74 | endif() |
| 75 | 75 | ||
| 76 | # ENet | ||
| 77 | add_subdirectory(enet) | ||
| 78 | target_include_directories(enet INTERFACE ./enet/include) | ||
| 79 | |||
| 76 | # Cubeb | 80 | # Cubeb |
| 77 | if(ENABLE_CUBEB) | 81 | if(ENABLE_CUBEB) |
| 78 | set(BUILD_TESTS OFF CACHE BOOL "") | 82 | set(BUILD_TESTS OFF CACHE BOOL "") |
| @@ -112,6 +116,11 @@ if (ENABLE_WEB_SERVICE) | |||
| 112 | if (WIN32) | 116 | if (WIN32) |
| 113 | target_link_libraries(httplib INTERFACE crypt32 cryptui ws2_32) | 117 | target_link_libraries(httplib INTERFACE crypt32 cryptui ws2_32) |
| 114 | endif() | 118 | endif() |
| 119 | |||
| 120 | # cpp-jwt | ||
| 121 | add_library(cpp-jwt INTERFACE) | ||
| 122 | target_include_directories(cpp-jwt INTERFACE ./cpp-jwt/include) | ||
| 123 | target_compile_definitions(cpp-jwt INTERFACE CPP_JWT_USE_VENDORED_NLOHMANN_JSON) | ||
| 115 | endif() | 124 | endif() |
| 116 | 125 | ||
| 117 | # Opus | 126 | # Opus |
diff --git a/externals/cpp-jwt b/externals/cpp-jwt new file mode 160000 | |||
| Subproject e12ef06218596b52d9b5d6e1639484866a8e706 | |||
diff --git a/externals/enet b/externals/enet new file mode 160000 | |||
| Subproject 39a72ab1990014eb399cee9d538fd529df99c6a | |||