build: Rework CI and move all bundling into new build target. (#6556)

* build: Rework CI and move all bundling into new build target.

* ci: Use "mingw" in msys2 release names for compatibility.

* ci: Use "osx" in macOS release names for compatibility.

* ci: Disable macOS upload.

Will be moved to a separate PR for canary merge.

externals/CMakeLists.txt

@@ -156,6 +156,7 @@ target_include_directories(enet INTERFACE ./enet/include)
 if (ENABLE_CUBEB)
     set(BUILD_TESTS OFF CACHE BOOL "")
     set(BUILD_TOOLS OFF CACHE BOOL "")
+    set(BUNDLE_SPEEX ON CACHE BOOL "")
     add_subdirectory(cubeb EXCLUDE_FROM_ALL)
 endif()
 
@@ -170,10 +171,14 @@ add_library(json-headers INTERFACE)
 target_include_directories(json-headers INTERFACE ./json)
 
 if (ENABLE_WEB_SERVICE)
-    find_package(OpenSSL 1.1)
-    if (OPENSSL_FOUND)
-        set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
-    else()
+    if (USE_SYSTEM_OPENSSL)
+        find_package(OpenSSL 1.1)
+        if (OPENSSL_FOUND)
+            set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
+        endif()
+    endif()
+
+    if (NOT OPENSSL_FOUND)
         # LibreSSL
         set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
         set(OPENSSLDIR "/etc/ssl/")

externals/cmake-modules/WindowsCopyFiles.cmake

@@ -1,28 +0,0 @@
-# Copyright 2016 Citra Emulator Project
-# Licensed under GPLv2 or any later version
-# Refer to the license.txt file included.
-
-# This file provides the function windows_copy_files.
-# This is only valid on Windows.
-
-# Include guard
-if(__windows_copy_files)
-	return()
-endif()
-set(__windows_copy_files YES)
-
-# Any number of files to copy from SOURCE_DIR to DEST_DIR can be specified after DEST_DIR.
-# This copying happens post-build.
-function(windows_copy_files TARGET SOURCE_DIR DEST_DIR)
-    # windows commandline expects the / to be \ so switch them
-    string(REPLACE "/" "\\\\" SOURCE_DIR ${SOURCE_DIR})
-    string(REPLACE "/" "\\\\" DEST_DIR ${DEST_DIR})
-
-    # /NJH /NJS /NDL /NFL /NC /NS /NP - Silence any output
-    # cmake adds an extra check for command success which doesn't work too well with robocopy
-    # so trick it into thinking the command was successful with the || cmd /c "exit /b 0"
-    add_custom_command(TARGET ${TARGET} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E make_directory ${DEST_DIR}
-        COMMAND robocopy ${SOURCE_DIR} ${DEST_DIR} ${ARGN} /NJH /NJS /NDL /NFL /NC /NS /NP || cmd /c "exit /b 0"
-    )
-endfunction()

externals/httplib/httplib.h

@@ -233,6 +233,12 @@ using socket_t = int;
 #undef X509_EXTENSIONS
 #undef PKCS7_SIGNER_INFO
 
+// libressl will warn without this, which becomes an error.
+#undef OCSP_REQUEST
+#undef OCSP_RESPONSE
+#undef PKCS7_ISSUER_AND_SERIAL
+#undef __WINCRYPT_H__
+
 #ifdef _MSC_VER
 #pragma comment(lib, "crypt32.lib")
 #pragma comment(lib, "cryptui.lib")