Skip to content

Commit 60080dc

Browse files
authored
Merge pull request #545 from jwlodek/minor-changes-common-driver-makefile
Minor modifications to commonDriverMakefile to remove unused link for…
2 parents 2d301cb + 4df75b4 commit 60080dc

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

ADApp/commonDriverMakefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ ifdef FFMPEGSERVER
217217
$(DBD_NAME)_DBD += ffmpegServer.dbd
218218
PROD_LIBS += ffmpegServer
219219
PROD_LIBS += avdevice avformat avcodec swresample swscale avutil
220+
PROD_SYS_LIBS += lzma
220221
endif
221222

222223
ifdef RECCASTER
@@ -240,9 +241,9 @@ ifdef ADPLUGINBAR
240241
PROD_LIBS += NDPluginBar
241242
ifdef OPENCV_LIB
242243
opencv_core_DIR +=$(OPENCV_LIB)
243-
PROD_LIBS += opencv_core opencv_imgproc opencv_highgui zbar
244+
PROD_LIBS += opencv_core opencv_imgproc zbar
244245
else
245-
PROD_SYS_LIBS += opencv_core opencv_imgproc opencv_highgui zbar
246+
PROD_SYS_LIBS += opencv_core opencv_imgproc zbar
246247
endif
247248
endif
248249

@@ -251,12 +252,12 @@ ifdef ADCOMPVISION
251252
PROD_LIBS += NDPluginCV
252253
ifdef OPENCV_LIB
253254
opencv_core_DIR += $(OPENCV_LIB)
254-
PROD_LIBS += opencv_core opencv_imgproc opencv_highgui
255+
PROD_LIBS += opencv_core opencv_imgproc
255256
ifeq ($(WITH_OPENCV_VIDEO), YES)
256257
PROD_LIBS += opencv_video opencv_videoio
257258
endif
258259
else
259-
PROD_SYS_LIBS += opencv_core opencv_imgproc opencv_highgui
260+
PROD_SYS_LIBS += opencv_core opencv_imgproc
260261
ifeq ($(WITH_OPENCV_VIDEO), YES)
261262
PROD_SYS_LIBS += opencv_video opencv_videoio
262263
endif

0 commit comments

Comments
 (0)