diff --git a/.github/workflows/nightly-companion-windows.yml b/.github/workflows/nightly-companion-windows.yml index 2ca583289..91034e359 100644 --- a/.github/workflows/nightly-companion-windows.yml +++ b/.github/workflows/nightly-companion-windows.yml @@ -60,11 +60,9 @@ jobs: wget https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-libs-11.2.0-10-any.pkg.tar.zst wget https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-11.2.0-10-any.pkg.tar.zst wget https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-crt-git-9.0.0.6448.b03cbfb95-1-any.pkg.tar.zst - wget https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-openssl-1.1.1.m-2-any.pkg.tar.zst pacman -U --noconfirm mingw-w64-i686-gcc-libs-11.2.0-10-any.pkg.tar.zst \ mingw-w64-i686-gcc-11.2.0-10-any.pkg.tar.zst \ - mingw-w64-i686-crt-git-9.0.0.6448.b03cbfb95-1-any.pkg.tar.zst \ - mingw-w64-i686-openssl-1.1.1.m-2-any.pkg.tar.zst + mingw-w64-i686-crt-git-9.0.0.6448.b03cbfb95-1-any.pkg.tar.zst - name: Install Qt uses: jurplel/install-qt-action@v3 diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 3dc778bc9..fbec44600 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -410,7 +410,7 @@ elseif(WIN32) # simulator dlls install(FILES ${simulator_plugins} DESTINATION ${INSTALL_DESTINATION}) # supporting utilities - set(INSTALL_TEMP_FILES dfu-util.exe libusb0.dll libusb-1.0.dll license.txt) + set(INSTALL_TEMP_FILES dfu-util.exe libusb0.dll libusb-1.0.dll libcrypto-1_1.dll libssl-1_1.dll license.txt) foreach(tmpfile ${INSTALL_TEMP_FILES}) install(FILES "${COMPANION_SRC_DIRECTORY}/../targets/windows/${tmpfile}" DESTINATION ${INSTALL_DESTINATION}) endforeach() @@ -442,64 +442,6 @@ elseif(WIN32) message(WARNING "Installer: SDL.dll not found, set SDL_LIB_DIR manually.") endif() - find_package(OpenSSL) - if (OPENSSL_FOUND) - message(STATUS ${OPENSSL_SSL_LIBRARY}) - - get_filename_component(OPENSSL_SSL_LIBRARY_DIR ${OPENSSL_SSL_LIBRARY} DIRECTORY) - - file(GLOB dlls "${OPENSSL_SSL_LIBRARY_DIR}/../*") - list(JOIN dlls " " dlls) - message(STATUS ${dlls}) - - file(GLOB dlls "${OPENSSL_SSL_LIBRARY_DIR}/*.dll") - list(JOIN dlls " " dlls) - message(STATUS ${dlls}) - - file(GLOB dlls "${OPENSSL_SSL_LIBRARY_DIR}/../bin/*.dll") - list(JOIN dlls " " dlls) - message(STATUS ${dlls}) - - file(GLOB dlls "${OPENSSL_SSL_LIBRARY_DIR}/../libexec/*.dll") - list(JOIN dlls " " dlls) - message(STATUS ${dlls}) - - file(GLOB dlls "${OPENSSL_SSL_LIBRARY_DIR}/../share/*.dll") - list(JOIN dlls " " dlls) - message(STATUS ${dlls}) - - file(GLOB dlls "${OPENSSL_SSL_LIBRARY_DIR}/../i686-w64-mingw32/*.dll") - list(JOIN dlls " " dlls) - message(STATUS ${dlls}) - - endif() - - - # SSL dlls (used by QtNetwork) - # file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" WIN_PROGRAM_FILES) - # find_path(SSL_LIB_DIR libssl-1_1.dll HINTS - # "${WIN_PROGRAM_FILES}/OpenSSL" "${WIN_PROGRAM_FILES}/OpenSSL-Win32" - # "${Qt5_Dir}" - # "C:/OpenSSL/" "C:/OpenSSL-Win32/" - # "${WIN_EXTRA_LIBS_PATH}" "${WIN_EXTRA_LIBS_PATH}/OpenSSL" "${WIN_EXTRA_LIBS_PATH}/OpenSSL-Win32" - # "${MINGW_DIR}/../opt/bin" - # "${PYTHON_DIRECTORY}/lib/site-packages/PyQt4" - # PATH_SUFFIXES bin - # DOC "Path to libssl-1_1.dll and libcrypto-1_1 (OpenSSL)" - # ) - # if (SSL_LIB_DIR) - # install(FILES "${SSL_LIB_DIR}/libssl-1_1.dll" "${SSL_LIB_DIR}/libcrypto-1_1.dll" DESTINATION ${INSTALL_DESTINATION} OPTIONAL) - # get_filename_component(OPENSSL_SSL_LIBRARY_DIR libeay DIRECTORY) - # set(OPENSSL_BIN_DIR "${OPENSSL_SSL_LIBRARY_DIR}/../bin") - # if (EXISTS "${OPENSSL_BIN_DIR}") - # install(DIRECTORY ${OPENSSL_BIN_DIR}/ DESTINATION ${INSTALL_DESTINATION} FILES_MATCHING PATTERN "*.dll") - # else() - # message(STATUS "Installer: OpenSSL bin directory not found, dlls not bundled.") - # endif() - # else() - # message(WARNING "Installer: SSL libs not found, set SSL_LIB_DIR manually.") - # endif() - # C++/system dlls, depends on compiler if(MSVC) file(TO_CMAKE_PATH "$ENV{windir}/SysWOW64" WIN_SYSDIR) # This would be "system32" for a 64-bit build or on x86... but how to tell? diff --git a/companion/targets/windows/libcrypto-1_1.dll b/companion/targets/windows/libcrypto-1_1.dll new file mode 100755 index 000000000..5a68bb220 Binary files /dev/null and b/companion/targets/windows/libcrypto-1_1.dll differ diff --git a/companion/targets/windows/libssl-1_1.dll b/companion/targets/windows/libssl-1_1.dll new file mode 100755 index 000000000..093722af1 Binary files /dev/null and b/companion/targets/windows/libssl-1_1.dll differ