summaryrefslogtreecommitdiffstats
path: root/externals
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2022-07-26 00:31:45 +0200
committerGitHub <noreply@github.com>2022-07-26 00:31:45 +0200
commit1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2 (patch)
tree999411f1ca76390654d1034c6d0bd2c47c3f101c /externals
parentMerge pull request #8564 from lat9nq/dinner-fork (diff)
parentnetwork: Address review comments (diff)
downloadyuzu-1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2.tar
yuzu-1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2.tar.gz
yuzu-1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2.tar.bz2
yuzu-1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2.tar.lz
yuzu-1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2.tar.xz
yuzu-1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2.tar.zst
yuzu-1e67d2b59f6dfd561768db3fb9a8e0c6a16ec9f2.zip
Diffstat (limited to '')
-rw-r--r--externals/CMakeLists.txt9
m---------externals/cpp-jwt0
m---------externals/enet0
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)
add_library(SDL2 ALIAS SDL2-static)
endif()
+# ENet
+add_subdirectory(enet)
+target_include_directories(enet INTERFACE ./enet/include)
+
# Cubeb
if(ENABLE_CUBEB)
set(BUILD_TESTS OFF CACHE BOOL "")
@@ -112,6 +116,11 @@ if (ENABLE_WEB_SERVICE)
if (WIN32)
target_link_libraries(httplib INTERFACE crypt32 cryptui ws2_32)
endif()
+
+ # cpp-jwt
+ add_library(cpp-jwt INTERFACE)
+ target_include_directories(cpp-jwt INTERFACE ./cpp-jwt/include)
+ target_compile_definitions(cpp-jwt INTERFACE CPP_JWT_USE_VENDORED_NLOHMANN_JSON)
endif()
# 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