Merge pull request #331 from docsteer/330-pcap-fix

Remove WinPcap Dlls
docsteer · May 25, 2024 · d9310c7 · d9310c7
2 parents 52904b2 + e1e99a8
commit d9310c7
Show file tree

Hide file tree

Showing 480 changed files with 46,534 additions and 49,062 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -234,14 +234,9 @@ target_link_libraries(sACNView PRIVATE ${SACNVIEW_QT_LIBRARIES})
 
 # Link PCap/WinPCap libraries
 target_link_libraries(sACNView PRIVATE ${PCAP_LIBS})
-
-if(WIN32)
-  # Copy WinPCap DLLs
-  foreach(DLLFILE IN LISTS PCAP_LIBS)
-    add_custom_command (TARGET sACNView POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different
-      $<TARGET_FILE:${DLLFILE}> $<TARGET_FILE_DIR:sACNView>)
-  endforeach()
+if(MSVC)
+    target_link_libraries(sACNView PRIVATE delayimp)
+    target_link_options(sACNView PRIVATE "/DELAYLOAD:wpcap.dll")
 endif()
 
 # Blake2

diff --git a/install/install.cmake b/install/install.cmake
@@ -41,13 +41,6 @@
           COMMAND ${CMAKE_COMMAND} -E copy_if_different
           $<TARGET_FILE:sACNView> ${SACNVIEW_DEPLOY_DIR})
 
-      # Copy WinPCap DLLs
-      foreach(DLLFILE IN LISTS PCAP_LIBS)
-        add_custom_command (TARGET sACNView POST_BUILD
-          COMMAND ${CMAKE_COMMAND} -E copy_if_different
-          $<TARGET_FILE:${DLLFILE}> ${SACNVIEW_DEPLOY_DIR})
-      endforeach()
-
       # Run makensis if is installed in default location
       if(EXISTS ${SACNVIEW_MAKENSIS_FILE})
         if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")

diff --git a/libs/WinPcap-413-173-b4.7z b/libs/WinPcap-413-173-b4.7z
diff --git a/libs/WinPcap-413-173-b4/Bin/Packet.dll b/libs/WinPcap-413-173-b4/Bin/Packet.dll
diff --git a/libs/WinPcap-413-173-b4/Bin/wpcap.dll b/libs/WinPcap-413-173-b4/Bin/wpcap.dll
diff --git a/libs/WinPcap-413-173-b4/Bin/x64/Packet.dll b/libs/WinPcap-413-173-b4/Bin/x64/Packet.dll
diff --git a/libs/WinPcap-413-173-b4/Bin/x64/wpcap.dll b/libs/WinPcap-413-173-b4/Bin/x64/wpcap.dll
diff --git a/libs/WinPcap-413-173-b4/Include/Packet32.h b/libs/WinPcap-413-173-b4/Include/Packet32.h
diff --git a/libs/WinPcap-413-173-b4/Include/pcap/ipnet.h b/libs/WinPcap-413-173-b4/Include/pcap/ipnet.h
diff --git a/libs/WinPcap-413-173-b4/Include/pcap/nflog.h b/libs/WinPcap-413-173-b4/Include/pcap/nflog.h