From 1a44949ef75016fa48f9daa0cf3c973ef7d3978c Mon Sep 17 00:00:00 2001
From: James <jselby@jselby.net>
Date: Tue, 8 Aug 2017 17:50:09 +1000
Subject: Update cryptopp

---
 externals/cryptopp/cryptopp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'externals')

diff --git a/externals/cryptopp/cryptopp b/externals/cryptopp/cryptopp
index 841c37e34..24bc2b856 160000
--- a/externals/cryptopp/cryptopp
+++ b/externals/cryptopp/cryptopp
@@ -1 +1 @@
-Subproject commit 841c37e34765487a2968357369ab74db8b10a62d
+Subproject commit 24bc2b85674254fb294e717eb5b47d9f53e786b8
-- 
cgit v1.2.3


From 056a08cdbfc593af6899ce3ef45fc62a6ff45ef7 Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Thu, 17 Aug 2017 13:18:39 +0100
Subject: externals: Update soundtouch

---
 externals/soundtouch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'externals')

diff --git a/externals/soundtouch b/externals/soundtouch
index 5274ec4de..019d2089b 160000
--- a/externals/soundtouch
+++ b/externals/soundtouch
@@ -1 +1 @@
-Subproject commit 5274ec4dec498bd88ccbcd28862a0f78a3b95eff
+Subproject commit 019d2089bbadf70d73ba85aa8ea51490b071262c
-- 
cgit v1.2.3


From 9e847b754933f09bdf19be0dc45fc32a65052965 Mon Sep 17 00:00:00 2001
From: James Rowe <jroweboy@gmail.com>
Date: Sat, 9 Sep 2017 11:24:13 -0600
Subject: Build: Enable SSL in mingw by linking against WinSSL

The mingw builds aren't submitting telemetry because the curl library
they are linked against is configured to use openSSL and openSSL looks
for the certificates in the users home folder. This keeps it from
contacting web services because it can't communicate over SSL.

This commit adds a download in mingw builds that will download a
precompiled curl for mingw linked against winssl and sspi.
---
 externals/CMakeLists.txt | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'externals')

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 8e4bcf21f..4a4ba1101 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -1,5 +1,8 @@
 # Definitions for all external bundled libraries
 
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
+include(DownloadExternals)
+
 # Catch
 add_library(catch-single-include INTERFACE)
 target_include_directories(catch-single-include INTERFACE catch/single_include)
@@ -54,9 +57,21 @@ add_subdirectory(enet)
 target_include_directories(enet INTERFACE ./enet/include)
 
 if (ENABLE_WEB_SERVICE)
+    # msys installed curl is configured to use openssl, but that isn't portable
+    # since it relies on having the bundled certs install in the home folder for SSL
+    # by default on mingw, download the precompiled curl thats linked against windows native ssl
+    if (MINGW AND CITRA_USE_BUNDLED_CURL)
+        download_bundled_external("curl/" "curl-7_55_1" CURL_PREFIX)
+        set(CURL_PREFIX "${CMAKE_BINARY_DIR}/externals/curl-7_55_1")
+        set(CURL_FOUND YES)
+        set(CURL_INCLUDE_DIR "${CURL_PREFIX}/include" CACHE PATH "Path to curl headers")
+        set(CURL_LIBRARY "${CURL_PREFIX}/lib/libcurldll.a" CACHE PATH "Path to curl library")
+        set(CURL_DLL_DIR "${CURL_PREFIX}/lib/" CACHE PATH "Path to curl.dll")
+        set(USE_SYSTEM_CURL ON CACHE BOOL "")
+    endif()
     # CPR
-    option(BUILD_TESTING OFF)
-    option(BUILD_CPR_TESTS OFF)
+    set(BUILD_TESTING OFF CACHE BOOL "")
+    set(BUILD_CPR_TESTS OFF CACHE BOOL "")
     add_subdirectory(cpr)
     target_include_directories(cpr INTERFACE ./cpr/include)
 
-- 
cgit v1.2.3