X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fopencv_build;fp=cinelerra-5.1%2Fopencv_build;h=097e97f5a41a7379a90504f75f86bc748ca7454a;hb=9d8694b7d2e0f4202e025eaf78d096340184b4e6;hp=86d96d1c6fda21767d8c7d771574c9bc88613655;hpb=021254e59b5296d0d174b53661acf2064b7292cb;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/opencv_build b/cinelerra-5.1/opencv_build index 86d96d1c..097e97f5 100644 --- a/cinelerra-5.1/opencv_build +++ b/cinelerra-5.1/opencv_build @@ -80,8 +80,8 @@ $(opencv)/build: $(opencv).src -DOPENCV_EXTRA_MODULES_PATH="$(opencv)_contrib/modules/" LFLAGS += -Wl,--start-group -LFLAGS += $(shell ls -1 $(opencv_prefix)/lib/libopencv_*.a 2> /dev/null) -LFLAGS += $(shell ls -1 $(opencv_prefix)/share/OpenCV/3rdparty/lib/lib*.a 2> /dev/null) +LFLAGS += $(shell ls -1 $(opencv_prefix)/lib*/libopencv_*.a 2> /dev/null) +LFLAGS += $(shell ls -1 $(opencv_prefix)/share/OpenCV/3rdparty/lib*/lib*.a 2> /dev/null) LFLAGS += -Wl,--end-group else ifeq ($(bld),dyn) $(opencv)/build: $(opencv).src