Merge branch 'master' into master-git.sevana

This commit is contained in:
2026-01-15 07:59:47 +03:00
3 changed files with 21 additions and 15 deletions

Binary file not shown.

Binary file not shown.

View File

@@ -72,21 +72,27 @@ if (CMAKE_SYSTEM MATCHES "Windows*")
# set (PCAPPP_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/pcappp/include) # set (PCAPPP_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/pcappp/include)
#if (CMAKE_BUILD_TYPE MATCHES "Release" OR CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo") set (PCAPPP_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/pcappp/include)
# set (PCAPPP_LIBS ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Release/Pcap++.lib
# ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Release/Packet++.lib if (CMAKE_BUILD_TYPE MATCHES "Release" OR CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo")
# ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Release/Packet.lib set (PCAPPP_LIBS ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Release/Pcap++.lib
# ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Release/Common++.lib ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Release/Packet++.lib
# ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Release/wpcap.lib ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Release/Packet.lib
# ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Release/pthreadVC3.lib) ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Release/Common++.lib
#else() ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Release/wpcap.lib
# set (PCAPPP_LIBS ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/Pcap++.lib ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Release/pthreadVC3.lib)
# ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/Packet++.lib else()
# ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/Packet.lib set (PCAPPP_LIBS ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/Pcap++.lib
# ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/Common++.lib ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/Packet++.lib
# ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/wpcap.lib ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/Packet.lib
# ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/pthreadVC3d.lib) ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/Common++.lib
#endif() ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/wpcap.lib
${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/pthreadVC3d.lib)
endif()
set (OPENSSL_SSL ${CMAKE_CURRENT_LIST_DIR}/openssl/1.1/win64/libssl.lib)
set (OPENSSL_CRYPTO ${CMAKE_CURRENT_LIST_DIR}/openssl/1.1/win64/libcrypto.lib)
set (OPENSSL_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/openssl/1.1/include)
endif() endif()