projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade to ffmpeg-2.8
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
Makefile
diff --git
a/cinelerra-5.0/cinelerra/Makefile
b/cinelerra-5.0/cinelerra/Makefile
index 4798bd5a6e40e0b8edb3dea183a21da312c578a6..065346f526efa10ca1e111990a7f50c511626f3c 100644
(file)
--- a/
cinelerra-5.0/cinelerra/Makefile
+++ b/
cinelerra-5.0/cinelerra/Makefile
@@
-88,10
+88,8
@@
OBJS = \
$(OBJDIR)/ffmpeg.o \
$(OBJDIR)/file.o \
$(OBJDIR)/fileac3.o \
$(OBJDIR)/ffmpeg.o \
$(OBJDIR)/file.o \
$(OBJDIR)/fileac3.o \
- $(OBJDIR)/fileavi.o \
$(OBJDIR)/filebase.o \
$(OBJDIR)/filebaseaudio.o \
$(OBJDIR)/filebase.o \
$(OBJDIR)/filebaseaudio.o \
- $(OBJDIR)/filebaseima4.o \
$(OBJDIR)/filebaseulaw.o \
$(OBJDIR)/filecr2.o \
$(OBJDIR)/fileffmpeg.o \
$(OBJDIR)/filebaseulaw.o \
$(OBJDIR)/filecr2.o \
$(OBJDIR)/fileffmpeg.o \
@@
-103,7
+101,6
@@
OBJS = \
$(OBJDIR)/filegif.o \
$(OBJDIR)/filelist.o \
$(OBJDIR)/filejpeg.o \
$(OBJDIR)/filegif.o \
$(OBJDIR)/filelist.o \
$(OBJDIR)/filejpeg.o \
- $(OBJDIR)/filemov.o \
$(OBJDIR)/filempeg.o \
$(OBJDIR)/fileogg.o \
$(OBJDIR)/filepng.o \
$(OBJDIR)/filempeg.o \
$(OBJDIR)/fileogg.o \
$(OBJDIR)/filepng.o \
@@
-145,6
+142,8
@@
OBJS = \
$(OBJDIR)/labels.o \
$(OBJDIR)/levelwindow.o \
$(OBJDIR)/levelwindowgui.o \
$(OBJDIR)/labels.o \
$(OBJDIR)/levelwindow.o \
$(OBJDIR)/levelwindowgui.o \
+ $(OBJDIR)/libdv.o \
+ $(OBJDIR)/libmjpeg.o \
$(OBJDIR)/loadbalance.o \
$(OBJDIR)/loadfile.o \
$(OBJDIR)/loadmode.o \
$(OBJDIR)/loadbalance.o \
$(OBJDIR)/loadfile.o \
$(OBJDIR)/loadmode.o \
@@
-306,23
+305,26
@@
OBJS = \
$(OBJDIR)/zoombar.o \
$(OBJDIR)/zoompanel.o \
\
$(OBJDIR)/zoombar.o \
$(OBJDIR)/zoompanel.o \
\
- $(OBJDIR)/devicempeginput.o \
- $(OBJDIR)/devicev4l2base.o \
- $(OBJDIR)/devicev4l2input.o \
- $(OBJDIR)/audiov4l2mpeg.o \
- $(OBJDIR)/vdevicev4l2mpeg.o \
- $(OBJDIR)/vdevicempeg.o \
$(OBJDIR)/audiompeg.o \
$(OBJDIR)/audiompeg.o \
+ $(OBJDIR)/audiov4l2mpeg.o \
+ $(OBJDIR)/bdcreate.o \
$(OBJDIR)/channelinfo.o \
$(OBJDIR)/channelinfo.o \
- $(OBJDIR)/recordbatches.o \
- $(OBJDIR)/remotecontrol.o \
- $(OBJDIR)/mediadb.o \
$(OBJDIR)/commercials.o \
$(OBJDIR)/dbwindow.o \
$(OBJDIR)/commercials.o \
$(OBJDIR)/dbwindow.o \
+ $(OBJDIR)/devicempeginput.o \
+ $(OBJDIR)/devicev4l2base.o \
+ $(OBJDIR)/devicev4l2input.o \
+ $(OBJDIR)/dvdcreate.o \
$(OBJDIR)/filedb.o \
$(OBJDIR)/filedb.o \
+ $(OBJDIR)/mediadb.o \
+ $(OBJDIR)/recordbatches.o \
+ $(OBJDIR)/remotecontrol.o \
+ $(OBJDIR)/shbtnprefs.o \
$(OBJDIR)/signalstatus.o \
$(OBJDIR)/strack.o \
$(OBJDIR)/swindow.o \
$(OBJDIR)/signalstatus.o \
$(OBJDIR)/strack.o \
$(OBJDIR)/swindow.o \
+ $(OBJDIR)/vdevicempeg.o \
+ $(OBJDIR)/vdevicev4l2mpeg.o \
$(OBJDIR)/wwindow.o \
# $(OBJDIR)/renderfarmfsclient.o \
$(OBJDIR)/wwindow.o \
# $(OBJDIR)/renderfarmfsclient.o \
@@
-334,31
+336,17
@@
THEME_DATA := $(OBJDIR)/theme_data.o
OUTPUT_G = $(OBJDIR)/cinelerra.debuginfo
OUTPUT = ../bin/cinelerra
OUTPUT_G = $(OBJDIR)/cinelerra.debuginfo
OUTPUT = ../bin/cinelerra
-CUTADS = $(OBJDIR)/cutads
-CUTOBJ = $(OBJDIR)/cutads.o
-CUTOBJS = $(CUTOBJ) \
- $(OBJDIR)/mediadb.o \
- $(OBJDIR)/filexml.o
-CUTLIBS = \
- ../libzmpeg3/$(OBJDIR)/libzmpeg3.a -lX11 \
- ../db/$(OBJDIR)/db.a
-
-ifeq ($(HAVE_AVIFILE), y)
-AVIFILE_DIR := $(shell cd ../avifile* ; pwd)
-endif
-
-
-
LIBRARIES := \
LIBRARIES := \
- ../quicktime/$(OBJDIR)/libquicktime.a \
../guicast/$(OBJDIR)/libguicast.a \
../libzmpeg3/$(OBJDIR)/libzmpeg3.a \
../mpeg2enc/$(OBJDIR)/hveg2enc.a \
../db/$(OBJDIR)/db.a \
$(THEME_DATA) \
../guicast/$(OBJDIR)/libguicast.a \
../libzmpeg3/$(OBJDIR)/libzmpeg3.a \
../mpeg2enc/$(OBJDIR)/hveg2enc.a \
../db/$(OBJDIR)/db.a \
$(THEME_DATA) \
-LIBS := $(LIBRARIES)
-
+LIBS = $(LIBRARIES)
+LIBS += $(thirdparty_libraries)
+LIBS += $(thirdparty_libraries)
+LIBS += $(thirdparty_libraries)
LIBS += \
-lX11 \
-lXext \
LIBS += \
-lX11 \
-lXext \
@@
-375,6
+363,18
@@
LIBS += \
-lfreetype \
$(EXTRA_LIBS)
-lfreetype \
$(EXTRA_LIBS)
+CUTADS = $(OBJDIR)/cutads
+CUTOBJ = $(OBJDIR)/cutads.o
+CUTOBJS = $(CUTOBJ) \
+ $(OBJDIR)/mediadb.o \
+ $(OBJDIR)/filexml.o
+CUTLIBS = \
+ ../libzmpeg3/$(OBJDIR)/libzmpeg3.a -lX11 \
+ ../db/$(OBJDIR)/db.a
+
+BDWRITE = $(OBJDIR)/bdwrite
+BDWOBJS = $(OBJDIR)/bdwrite.o
+
ifeq ($(HAVE_GL), y)
LIBS += -lGL -lGLU
endif
ifeq ($(HAVE_GL), y)
LIBS += -lGL -lGLU
endif
@@
-390,9
+390,7
@@
endif
CFLAGS += \
CFLAGS += \
- -c \
-I../guicast \
-I../guicast \
- -I../quicktime \
-I../libzmpeg3 \
$(static_includes) \
-I../libzmpeg3 \
$(static_includes) \
@@
-432,26
+430,15
@@
LINKER = g++ -o $(OUTPUT)
endif
endif
-# Enable AVIFile support
-ifeq ($(HAVE_AVIFILE), y)
-
-CFLAGS += -DUSE_AVIFILE -I$(AVIFILE_DIR)/include
-LIBS += \
- $(AVIFILE_DIR)/libmmxnow/src/.libs/libmmxnow.a \
- $(AVIFILE_DIR)/lib/.libs/libaviplay.a
-
-endif
-
-
FFMPEG_CFLAGS := \
-include /usr/include/time.h \
FFMPEG_CFLAGS := \
-include /usr/include/time.h \
-$(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
-$(shell echo $(CFLAGS) $(FFMPEG_CFLAGS) > $(OBJDIR)/ffmpeg_cflags)
-$(shell echo $(LDFLAGS1) $(OBJS) $(DCRAW) $(FILEEXR) $(FILEFLAC) $(
FFMPEG_OBJS) $(
AVIOBJS) \
- $(
thirdparty_libraries) $(thirdparty_libraries
) $(LIBS) $(LDFLAGS2) > $(OBJDIR)/objs)
+$(shell echo $(CFLAGS)
-c
> $(OBJDIR)/c_flags)
+$(shell echo $(CFLAGS)
-c
$(FFMPEG_CFLAGS) > $(OBJDIR)/ffmpeg_cflags)
+$(shell echo $(LDFLAGS1) $(OBJS) $(DCRAW) $(FILEEXR) $(FILEFLAC) $(AVIOBJS) \
+ $(
FFMPEG_OBJS
) $(LIBS) $(LDFLAGS2) > $(OBJDIR)/objs)
-all: $(OUTPUT) $(CUTADS)
+all: $(OUTPUT) $(CUTADS)
$(BDWRITE)
# Static linking is not possible because the plugins depend on symbols
# in the main executable.
# Static linking is not possible because the plugins depend on symbols
# in the main executable.
@@
-462,7
+449,12
@@
$(OUTPUT): $(OBJS) $(DCRAW) $(FILEEXR) $(FFMPEG_OBJS) $(FILEFLAC) $(LIBRARIES)
$(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT))
$(CUTADS): $(CUTOBJS) $(CUTLIBS)
$(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT))
$(CUTADS): $(CUTOBJS) $(CUTLIBS)
- g++ -pthread -o $(OBJDIR)/cutads $(CUTOBJS) $(CUTLIBS)
+ @echo g++ -o $@ $(CUTOBJS)
+ @g++ $(CFLAGS) -pthread -o $@ $(CUTOBJS) $(CUTLIBS)
+
+$(BDWRITE): $(BDWOBJS)
+ @echo g++ -o $@ $(BDWOBJS)
+ @g++ $(CFLAGS) -pthread -o $@ $(BDWOBJS) $(LIBS)
$(OBJDIR)/test:
$(CC) -shared -o $(OBJDIR)/test.so \
$(OBJDIR)/test:
$(CC) -shared -o $(OBJDIR)/test.so \
@@
-481,7
+473,7
@@
clean:
-o -name '*.so' \) -exec rm -f {} \; -prune
tags:
-o -name '*.so' \) -exec rm -f {} \; -prune
tags:
- ctags -R -h default --langmap=c:+.inc . ../guicast/ ../libzmpeg3 ../
quicktime ../
plugins
+ ctags -R -h default --langmap=c:+.inc . ../guicast/ ../libzmpeg3 ../plugins
$(OBJDIR)/%.o: %.C
$(OBJDIR)/%.o: %.C