projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compositor f1-f10/j/p shortcuts, opencv upgrade, new stylize,puzzle opencv plugins
[goodguy/history.git]
/
cinelerra-5.1
/
opencv_build
diff --git
a/cinelerra-5.1/opencv_build
b/cinelerra-5.1/opencv_build
index 86d96d1c6fda21767d8c7d771574c9bc88613655..097e97f5a41a7379a90504f75f86bc748ca7454a 100644
(file)
--- 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
-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
LFLAGS += -Wl,--end-group
else ifeq ($(bld),dyn)
$(opencv)/build: $(opencv).src