Skip to content

Commit

Permalink
Merge pull request #133 from i3drobotics/updated-pro-script
Browse files Browse the repository at this point in the history
updated stereo_vision_toolkit.pro pylon directory
  • Loading branch information
kinyipchan913 authored Sep 23, 2022
2 parents aab57e7 + ce627e3 commit f9727bc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ installer/Output/*
3rdparty/i3drsgm/i3drsgm
3rdparty/opencv-contrib-cuda/opencv-4.5.0-contrib-cuda11.1-cudnn8.0.4-vc15.exe
3rdparty/i3drsgm/i3drsgm-*.exe
3rdparty/pylon/pylon
3rdparty/pylon/*
!3rdparty/pylon/*.bat
9 changes: 4 additions & 5 deletions stereo_vision_toolkit.pro
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ INCLUDEPATH += "$$_PRO_FILE_PWD_/3rdparty/eigen"
INCLUDEPATH += "$$_PRO_FILE_PWD_/3rdparty/hidapi/include"
INCLUDEPATH += "$$_PRO_FILE_PWD_/3rdparty/tis/include"
INCLUDEPATH += "$$_PRO_FILE_PWD_/3rdparty/yaml-cpp/include"
INCLUDEPATH += "$$_PRO_FILE_PWD_/3rdparty/pylon/pylon/Development/include"
INCLUDEPATH += "$$_PRO_FILE_PWD_/3rdparty/pylon/include"
INCLUDEPATH += "$$_PRO_FILE_PWD_/3rdparty/dshow/include"

# Define libaries
Expand Down Expand Up @@ -325,7 +325,7 @@ WITH_I3DRSGM {
}

# Basler library files
LIBS += -L"$$_PRO_FILE_PWD_/3rdparty/pylon/pylon/Development/lib/x64"
LIBS += -L"$$_PRO_FILE_PWD_/3rdparty/pylon/lib"

win32 {
# Directshow libraries
Expand Down Expand Up @@ -354,8 +354,7 @@ win32 {
EXTRA_FILES += \
$$files($$_PRO_FILE_PWD_/3rdparty/opengl/*.dll, true) \
$$files($$_PRO_FILE_PWD_/3rdparty/cuda/bin/*.dll, true) \
$$files($$_PRO_FILE_PWD_/3rdparty/pylon/pylon/Runtime/x64/*.dll, true) \
$$files($$_PRO_FILE_PWD_/3rdparty/pylon//Development/Assemblies/Basler.Pylon/x64/*.dll, true) \
$$files($$_PRO_FILE_PWD_/3rdparty/pylon/bin/*.dll, true) \
$$_PRO_FILE_PWD_/3rdparty/hidapi/bin/Release/hidapi.dll \
$$_PRO_FILE_PWD_/3rdparty/tbb/tbb.dll \
$$files($$_PRO_FILE_PWD_/3rdparty/openssl-1.1.1g/Win64/bin/*.dll, true)
Expand Down Expand Up @@ -392,7 +391,7 @@ win32 {
}

# Define drivers to copy to build folder
EXTRA_FILES += $$files($$_PRO_FILE_PWD_/3rdparty/pylon/pylon/Development/Redist/Drivers/*.msi, true)
EXTRA_FILES += $$files($$_PRO_FILE_PWD_/3rdparty/pylon/Redist/Drivers/*.msi, true)
EXTRA_FILES += $$files($$_PRO_FILE_PWD_/3rdparty/pylon/install_drivers.bat, true)

# I3DRSGM dlls
Expand Down

0 comments on commit f9727bc

Please sign in to comment.