Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove WinPcap Dlls #331

Merged
merged 4 commits into from
May 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 3 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions install/install.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Binary file removed libs/WinPcap-413-173-b4.7z
Binary file not shown.
Binary file removed libs/WinPcap-413-173-b4/Bin/Packet.dll
Binary file not shown.
Binary file removed libs/WinPcap-413-173-b4/Bin/wpcap.dll
Binary file not shown.
Binary file removed libs/WinPcap-413-173-b4/Bin/x64/Packet.dll
Binary file not shown.
Binary file removed libs/WinPcap-413-173-b4/Bin/x64/wpcap.dll
Binary file not shown.
361 changes: 0 additions & 361 deletions libs/WinPcap-413-173-b4/Include/Packet32.h

This file was deleted.

43 changes: 0 additions & 43 deletions libs/WinPcap-413-173-b4/Include/pcap/ipnet.h

This file was deleted.

92 changes: 0 additions & 92 deletions libs/WinPcap-413-173-b4/Include/pcap/nflog.h

This file was deleted.

Loading
Loading