Skip to content

Minor modifications to commonDriverMakefile to remove unused link for… #545

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.

Sign up for GitHub

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

Merged
MarkRivers merged 2 commits into from
Aug 5, 2025
Merged

Minor modifications to commonDriverMakefile to remove unused link for… #545

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc30bed
Remove unused opencv_highgui link for CV plugins
jwlodek Jul 31, 2025
4df75b4
Add missing link to lzma library for ffmpegServer plugin
jwlodek Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ADApp/commonDriverMakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ ifdef FFMPEGSERVER
$(DBD_NAME)_DBD += ffmpegServer.dbd
PROD_LIBS += ffmpegServer
PROD_LIBS += avdevice avformat avcodec swresample swscale avutil
PROD_SYS_LIBS += lzma
endif

ifdef RECCASTER
Expand All @@ -240,9 +241,9 @@ ifdef ADPLUGINBAR
PROD_LIBS += NDPluginBar
ifdef OPENCV_LIB
opencv_core_DIR +=$(OPENCV_LIB)
PROD_LIBS += opencv_core opencv_imgproc opencv_highgui zbar
PROD_LIBS += opencv_core opencv_imgproc zbar
else
PROD_SYS_LIBS += opencv_core opencv_imgproc opencv_highgui zbar
PROD_SYS_LIBS += opencv_core opencv_imgproc zbar
endif
endif

Expand All @@ -251,12 +252,12 @@ ifdef ADCOMPVISION
PROD_LIBS += NDPluginCV
ifdef OPENCV_LIB
opencv_core_DIR += $(OPENCV_LIB)
PROD_LIBS += opencv_core opencv_imgproc opencv_highgui
PROD_LIBS += opencv_core opencv_imgproc
ifeq ($(WITH_OPENCV_VIDEO), YES)
PROD_LIBS += opencv_video opencv_videoio
endif
else
PROD_SYS_LIBS += opencv_core opencv_imgproc opencv_highgui
PROD_SYS_LIBS += opencv_core opencv_imgproc
ifeq ($(WITH_OPENCV_VIDEO), YES)
PROD_SYS_LIBS += opencv_video opencv_videoio
endif
Expand Down
Loading