projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prevent popup deactivation while button_down
[goodguy/history.git]
/
cinelerra-5.0
/
build
/
Makefile.cinelerra
diff --git
a/cinelerra-5.0/build/Makefile.cinelerra
b/cinelerra-5.0/build/Makefile.cinelerra
index a46f218254fee1fe499e1eefe9c617956e5db454..6537a5ea32b71c328601fc79ca7896c8ed2465d4 100644
(file)
--- a/
cinelerra-5.0/build/Makefile.cinelerra
+++ b/
cinelerra-5.0/build/Makefile.cinelerra
@@
-10,7
+10,6
@@
endif
DIRS := \
thirdparty \
DIRS := \
thirdparty \
- quicktime \
libzmpeg3 \
mpeg2enc \
mplexlo \
libzmpeg3 \
mpeg2enc \
mplexlo \
@@
-47,15
+46,21
@@
dist-clean:
# find \( -name .deps \) -exec rm -rf {} \; -prune
find \( -name .libs \) -exec rm -rf {} \; -prune
# find \( -name .deps \) -exec rm -rf {} \; -prune
find \( -name .libs \) -exec rm -rf {} \; -prune
-MJPEGDIR := $(shell expr thirdparty/mjpegtools* )
+MJPEGDIR := $(shell expr $(THIRDPARTY)/mjpegtools* )
+MPEG2ENC := bin/mpeg2enc
+MPEG2PLEX := bin/mplex
+HVEG2ENC := bin/hveg2enc
-$(
PLUGIN_DIR)/mpeg2enc.plugin
:
-
/bin/
cp -a $(MJPEGDIR)/mpeg2enc/mpeg2enc $@
+$(
MPEG2ENC)
:
+ cp -a $(MJPEGDIR)/mpeg2enc/mpeg2enc $@
-
bin/mplex
:
-
/bin/
cp -a $(MJPEGDIR)/mplex/mplex $@
+
$(MPEG2PLEX)
:
+ cp -a $(MJPEGDIR)/mplex/mplex $@
-install: $(PLUGIN_DIR)/mpeg2enc.plugin bin/mplex
+$(HVEG2ENC):
+ cp -a $(TOPDIR)/mpeg2enc/$(OBJDIR)/hveg2enc $@
+
+install: $(MPEG2PLEX) $(MPEG2ENC) $(HVEG2ENC)
$(MAKE) -C plugins install
DST=../bin $(MAKE) -C libzmpeg3 install
$(MAKE) -C po install
$(MAKE) -C plugins install
DST=../bin $(MAKE) -C libzmpeg3 install
$(MAKE) -C po install
@@
-75,7
+80,7
@@
endif
rm -f bin/new_db
$(MAKE) -C db/utils new_db
cp -a db/utils/new_db bin/.
rm -f bin/new_db
$(MAKE) -C db/utils new_db
cp -a db/utils/new_db bin/.
- cp -a ffmpeg bin/.
+ cp -a ffmpeg
msg.txt
bin/.
@if [ ! -f "/cinelerra/media.db" ]; then \
echo "need to run:"; \
echo " mkdir /cinelerra"; \
@if [ ! -f "/cinelerra/media.db" ]; then \
echo "need to run:"; \
echo " mkdir /cinelerra"; \