projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
file probe prefs, updated dcraw, bugs - garbage, accel, ffmpeg/giphy.gif
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
Makefile
diff --git
a/cinelerra-5.1/cinelerra/Makefile
b/cinelerra-5.1/cinelerra/Makefile
index 4ce1cb8f102930070f5a8959487bdb4a690d4864..93fd8b61ec392d06693c604dce3e720e8ef26347 100644
(file)
--- a/
cinelerra-5.1/cinelerra/Makefile
+++ b/
cinelerra-5.1/cinelerra/Makefile
@@
-226,6
+226,7
@@
OBJS = \
$(OBJDIR)/pluginvclient.o \
$(OBJDIR)/preferences.o \
$(OBJDIR)/preferencesthread.o \
$(OBJDIR)/pluginvclient.o \
$(OBJDIR)/preferences.o \
$(OBJDIR)/preferencesthread.o \
+ $(OBJDIR)/probeprefs.o \
$(OBJDIR)/question.o \
$(OBJDIR)/quit.o \
$(OBJDIR)/recconfirmdelete.o \
$(OBJDIR)/question.o \
$(OBJDIR)/quit.o \
$(OBJDIR)/recconfirmdelete.o \
@@
-360,10
+361,11
@@
CUTLIBS = \
BDWRITE = $(OBJDIR)/bdwrite
BDWOBJS = $(OBJDIR)/bdwrite.o
BDWRITE = $(OBJDIR)/bdwrite
BDWOBJS = $(OBJDIR)/bdwrite.o
-CFLAGS
+
= \
+CFLAGS
:
= \
-I$(GUICAST) \
-I$(LIBZMPEG3) \
$(static_incs) \
-I$(GUICAST) \
-I$(LIBZMPEG3) \
$(static_incs) \
+ $(CFLAGS)
# Speed up linking with this linking sequence
ifeq ($(OBJDIR), alpha)
# Speed up linking with this linking sequence
ifeq ($(OBJDIR), alpha)
@@
-444,7
+446,7
@@
$(OBJDIR)/sha1.o: sha1.C sha1.h
$(CXX) `cat $(OBJDIR)/c_flags` -O3 -c $< -o $@
$(DCRAW): dcraw.c
$(CXX) `cat $(OBJDIR)/c_flags` -O3 -c $< -o $@
$(DCRAW): dcraw.c
- $(GCC) `cat $(OBJDIR)/c_flags` -Wno-misleading-indentation dcraw.c -c -o $*.o
+ $(GCC) `cat $(OBJDIR)/c_flags` -
O4 -
Wno-misleading-indentation dcraw.c -c -o $*.o
$(THEME_DATA):
cd $(OBJDIR) && \
$(THEME_DATA):
cd $(OBJDIR) && \