5 files changed, 21 insertions, 2 deletions

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index b809d76d8..8f42f4fdc 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)
@@ -46,6 +49,10 @@ add_subdirectory(soundtouch)
 # The SoundTouch target doesn't export the necessary include paths as properties by default
 target_include_directories(SoundTouch INTERFACE ./soundtouch/include)
 
+# Unicorn
+add_library(unicorn-headers INTERFACE)
+target_include_directories(unicorn-headers INTERFACE ./unicorn/include)
+
 # Xbyak
 if (ARCHITECTURE_x86_64)
     # Defined before "dynarmic" above
@@ -59,9 +66,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)
 
diff --git a/externals/cryptopp/cryptopp b/externals/cryptopp/cryptopp
-Subproject 841c37e34765487a2968357369ab74db8b10a62
+Subproject 24bc2b85674254fb294e717eb5b47d9f53e786b
diff --git a/externals/dynarmic b/externals/dynarmic
-Subproject 8f15e3f70cb96e56705e5de6ba97b5d09423a56
+Subproject 69eccf826d657a6cfb1d731b00629939d230ec5
diff --git a/externals/enet b/externals/enet
-Subproject a84c120eff13d2fa3eadb41ef7afe0f7819f4d6
+Subproject 9d9ba122d4818f7ae1aef2197933ac696edb233
diff --git a/externals/soundtouch b/externals/soundtouch
-Subproject 5274ec4dec498bd88ccbcd28862a0f78a3b95ef
+Subproject 019d2089bbadf70d73ba85aa8ea51490b071262