projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more Andrew improved/new ffmpeg render format choices
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
guicast
/
Makefile
diff --git
a/cinelerra-5.1/guicast/Makefile
b/cinelerra-5.1/guicast/Makefile
index 1c3822f3392d47c5bb921d2d3330aae1a3807c86..cf189dea6d25e5d9c481b3628a30e7657cc9c57c 100644
(file)
--- a/
cinelerra-5.1/guicast/Makefile
+++ b/
cinelerra-5.1/guicast/Makefile
@@
-27,6
+27,7
@@
OBJS = \
$(OBJDIR)/bcdialog.o \
$(OBJDIR)/bcdisplay.o \
$(OBJDIR)/bcdisplayinfo.o \
$(OBJDIR)/bcdialog.o \
$(OBJDIR)/bcdisplay.o \
$(OBJDIR)/bcdisplayinfo.o \
+ $(OBJDIR)/bcdragbox.o \
$(OBJDIR)/bcdragwindow.o \
$(OBJDIR)/bcfilebox.o \
$(OBJDIR)/bcfontentry.o \
$(OBJDIR)/bcdragwindow.o \
$(OBJDIR)/bcfilebox.o \
$(OBJDIR)/bcfontentry.o \
@@
-87,7
+88,7
@@
OUTPUT = $(OBJDIR)/libguicast.a
UTILS = $(OBJDIR)/bootstrap $(OBJDIR)/pngtoh $(OBJDIR)/pngtoraw
BCXFER = xfer/$(OBJDIR)/xfer.stamp
UTILS = $(OBJDIR)/bootstrap $(OBJDIR)/pngtoh $(OBJDIR)/pngtoraw
BCXFER = xfer/$(OBJDIR)/xfer.stamp
-CFLAGS +=
-I/usr/include/freetype2
+CFLAGS +=
$(static_incs)
$(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
$(shell echo $(OBJS) > $(OBJDIR)/objs)
$(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
$(shell echo $(OBJS) > $(OBJDIR)/objs)
@@
-95,7
+96,7
@@
$(shell echo $(OBJS) > $(OBJDIR)/objs)
all: $(OUTPUT) $(UTILS)
$(BCXFER): bccmdl.py bcxfer.C bcxfer.h
all: $(OUTPUT) $(UTILS)
$(BCXFER): bccmdl.py bcxfer.C bcxfer.h
- python
2.7
< ./bccmdl.py
+ python < ./bccmdl.py
+$(MAKE) -C xfer
$(OUTPUT): $(OBJS) $(BCXFER)
+$(MAKE) -C xfer
$(OUTPUT): $(OBJS) $(BCXFER)