projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug fixes, typos, and omits in yuv mod
[goodguy/history.git]
/
cinelerra-5.1
/
plugins
/
Makefile
diff --git
a/cinelerra-5.1/plugins/Makefile
b/cinelerra-5.1/plugins/Makefile
index cf72e5ac70b95d9bdb3100189616cf2e86df3571..bf9b83673424e97788bcecbcb6e013b490cf2f03 100644
(file)
--- a/
cinelerra-5.1/plugins/Makefile
+++ b/
cinelerra-5.1/plugins/Makefile
@@
-1,11
+1,15
@@
export TOPDIR ?= $(CURDIR)/..
include $(TOPDIR)/global_config
export TOPDIR ?= $(CURDIR)/..
include $(TOPDIR)/global_config
+default: all
ifeq ($(WANT_DVB), yes)
LIVEDVB = liveaudio livevideo
endif
ifeq ($(WANT_DVB), yes)
LIVEDVB = liveaudio livevideo
endif
-ifneq ($(WANT_FINDOBJECT), no)
-FINDOBJECT = findobject
+ifneq ($(WANT_OPENCV), no)
+want_var:=$(WANT_OPENCV)
+include $(TOPDIR)/opencv_build
+OPENCV_OBJS := findobj flowobj gaborobj moveobj
+$(OPENCV_OBJS): opencv
endif
# burn must come before any other effecttv plugin
endif
# burn must come before any other effecttv plugin
@@
-13,7
+17,7
@@
endif
# parametric must come before fourier plugins
# motion must come before perspective
# parametric must come before fourier plugins
# motion must come before perspective
-DIRS = \
+DIRS =
$(OPENCV_OBJS)
\
1080to480 \
1080to540 \
720to480 \
1080to480 \
1080to540 \
720to480 \
@@
-54,7
+58,6
@@
DIRS = \
echo \
echocancel \
fieldframe \
echo \
echocancel \
fieldframe \
- $(FINDOBJECT) \
flash \
flip \
framefield \
flash \
flip \
framefield \
@@
-117,6
+120,7
@@
DIRS = \
shiftinterlace \
slide \
spectrogram \
shiftinterlace \
slide \
spectrogram \
+ spherecam \
svg \
swapchannels \
swapframes \
svg \
swapchannels \
swapframes \