diff options
| author | fearlessTobi <thm.frey@gmail.com> | 2018-09-17 20:58:24 +0200 |
|---|---|---|
| committer | fearlessTobi <thm.frey@gmail.com> | 2018-10-02 15:30:48 +0200 |
| commit | 120d8f3bf7951b5fbe84b18338381227cf1452f0 (patch) | |
| tree | 2756b16b0942d0052d1678a8ffc4424d614e9db8 | |
| parent | Address a bunch of review comments (diff) | |
| download | yuzu-120d8f3bf7951b5fbe84b18338381227cf1452f0.tar yuzu-120d8f3bf7951b5fbe84b18338381227cf1452f0.tar.gz yuzu-120d8f3bf7951b5fbe84b18338381227cf1452f0.tar.bz2 yuzu-120d8f3bf7951b5fbe84b18338381227cf1452f0.tar.lz yuzu-120d8f3bf7951b5fbe84b18338381227cf1452f0.tar.xz yuzu-120d8f3bf7951b5fbe84b18338381227cf1452f0.tar.zst yuzu-120d8f3bf7951b5fbe84b18338381227cf1452f0.zip | |
| -rw-r--r-- | externals/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/core/telemetry_session.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index c6b175147..6a573881d 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -73,7 +73,7 @@ endif() # DiscordRPC if (USE_DISCORD_PRESENCE) - add_subdirectory(discord-rpc) + add_subdirectory(discord-rpc EXCLUDE_FROM_ALL) target_include_directories(discord-rpc INTERFACE ./discord-rpc/include) endif() @@ -81,11 +81,11 @@ if (ENABLE_WEB_SERVICE) # LibreSSL set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") add_definitions(-DHAVE_INET_NTOP) - add_subdirectory(libressl) + add_subdirectory(libressl EXCLUDE_FROM_ALL) target_include_directories(ssl INTERFACE ./libressl/include) # lurlparser - add_subdirectory(lurlparser) + add_subdirectory(lurlparser EXCLUDE_FROM_ALL) # httplib add_library(httplib INTERFACE) @@ -94,4 +94,4 @@ if (ENABLE_WEB_SERVICE) # JSON add_library(json-headers INTERFACE) target_include_directories(json-headers INTERFACE ./json) -endif()
\ No newline at end of file +endif() diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp index c02188adc..f29fff1e7 100644 --- a/src/core/telemetry_session.cpp +++ b/src/core/telemetry_session.cpp @@ -33,7 +33,7 @@ static u64 GenerateTelemetryId() { mbedtls_ctr_drbg_init(&ctr_drbg); ASSERT(mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, reinterpret_cast<const unsigned char*>(personalization.c_str()), - personalization.size()) == 0) + personalization.size()) == 0); ASSERT(mbedtls_ctr_drbg_random(&ctr_drbg, reinterpret_cast<unsigned char*>(&telemetry_id), sizeof(u64)) == 0); |