diff --git a/pcappp/lib/win/x64/Debug/Common++.lib b/pcappp/lib/win/x64/Debug/Common++.lib new file mode 100644 index 0000000..5608daf Binary files /dev/null and b/pcappp/lib/win/x64/Debug/Common++.lib differ diff --git a/pcappp/lib/win/x64/Release/Common++.lib b/pcappp/lib/win/x64/Release/Common++.lib new file mode 100644 index 0000000..2cad783 Binary files /dev/null and b/pcappp/lib/win/x64/Release/Common++.lib differ diff --git a/platform_libs.cmake b/platform_libs.cmake index 8b784f4..880150a 100644 --- a/platform_libs.cmake +++ b/platform_libs.cmake @@ -69,14 +69,21 @@ if (CMAKE_SYSTEM MATCHES "Windows*") set (CRASHRPT_LIB ${CMAKE_CURRENT_LIST_DIR}/crashrpt/win64/lib/dll/crashrpt1500.lib) set (PCAPPP_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/pcappp/include) - set (PCAPPP_LIBS ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/${CMAKE_BUILD_TYPE}/Pcap++.lib - ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/${CMAKE_BUILD_TYPE}/Packet++.lib - ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/${CMAKE_BUILD_TYPE}/Packet.lib - ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/${CMAKE_BUILD_TYPE}/wpcap.lib) - if (CMAKE_BUILD_TYPE MATCHES "Debug") - set (PCAPPP_LIBS ${PCAPPP_LIBS} ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/pthreadVC3d.lib) + + if (CMAKE_BUILD_TYPE MATCHES "Release" OR CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo") + 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 + ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Release/Packet.lib + ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Release/Common++.lib + ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Release/wpcap.lib + ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Release/pthreadVC3.lib) else() - set (PCAPPP_LIBS ${PCAPPP_LIBS} ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Release/pthreadVC3.lib) + set (PCAPPP_LIBS ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/Pcap++.lib + ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/Packet++.lib + ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/Packet.lib + ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/Common++.lib + ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/wpcap.lib + ${CMAKE_CURRENT_LIST_DIR}/pcappp/lib/win/x64/Debug/pthreadVC3d.lib) endif() endif()