Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-13 11:29:51 +03:00
Code Issues Wiki Activity

Issue with SSL

Browse source
This commit is contained in:
Bertrand Songis 2023-10-02 22:06:27 +02:00
parent 30cac31fda
commit 8b9ba05d80
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/nightly-companion-windows.yml vendored
View file

@ -63,7 +63,8 @@ jobs:
wget https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-openssl-1.1.1.s-1-any.pkg.tar.zst wget https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-openssl-1.1.1.s-1-any.pkg.tar.zst
pacman -U --noconfirm mingw-w64-i686-gcc-libs-11.2.0-10-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-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-crt-git-9.0.0.6448.b03cbfb95-1-any.pkg.tar.zst \
mingw-w64-i686-openssl-1.1.1.s-1-any.pkg.tar.zst
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3

2
companion/src/CMakeLists.txt
View file

@ -333,8 +333,6 @@ endif()
# Generate list of simulator plugins, used by all platforms # Generate list of simulator plugins, used by all platforms
if(WIN32) if(WIN32)
file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/*opentx-*simulator${CMAKE_SHARED_LIBRARY_SUFFIX}") file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/*opentx-*simulator${CMAKE_SHARED_LIBRARY_SUFFIX}")
message(STATUS ${CMAKE_BINARY_DIR})
message(STATUS ${simulator_plugins})
else() else()
file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/*opentx-*simulator${CMAKE_SHARED_LIBRARY_SUFFIX}") file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/*opentx-*simulator${CMAKE_SHARED_LIBRARY_SUFFIX}")
endif() endif()