AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into feature/qt6-libssh-support

Browse source
This commit is contained in:
pokamest 2023-01-31 00:53:24 +00:00
commit ddefb99e5e
20 changed files with 128 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/3rd/QtSsh/src/botan/botan.cmake
View file

@ -27,7 +27,7 @@ if(APPLE AND NOT IOS)
set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/macos/botan_all.cpp)
endif()
if(LINUX)
if(LINUX AND NOT ANDROID)
include_directories(${CMAKE_CURRENT_LIST_DIR}/linux)
set(HEADERS ${HEADERS} ${CMAKE_CURRENT_LIST_DIR}/linux/botan_all.h)
set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/linux/botan_all.cpp)