projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add ffmpeg filters as plugins
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
Makefile
diff --git
a/cinelerra-5.0/cinelerra/Makefile
b/cinelerra-5.0/cinelerra/Makefile
index 065346f526efa10ca1e111990a7f50c511626f3c..6b0d1bd13ce1ac630d7b51bf47b84f8f0d651e88 100644
(file)
--- a/
cinelerra-5.0/cinelerra/Makefile
+++ b/
cinelerra-5.0/cinelerra/Makefile
@@
-326,6
+326,7
@@
OBJS = \
$(OBJDIR)/vdevicempeg.o \
$(OBJDIR)/vdevicev4l2mpeg.o \
$(OBJDIR)/wwindow.o \
$(OBJDIR)/vdevicempeg.o \
$(OBJDIR)/vdevicev4l2mpeg.o \
$(OBJDIR)/wwindow.o \
+ $(OBJDIR)/pluginfclient.o \
# $(OBJDIR)/renderfarmfsclient.o \
# $(OBJDIR)/renderfarmfsserver.o \
# $(OBJDIR)/renderfarmfsclient.o \
# $(OBJDIR)/renderfarmfsserver.o \
@@
-344,9
+345,6
@@
LIBRARIES := \
$(THEME_DATA) \
LIBS = $(LIBRARIES)
$(THEME_DATA) \
LIBS = $(LIBRARIES)
-LIBS += $(thirdparty_libraries)
-LIBS += $(thirdparty_libraries)
-LIBS += $(thirdparty_libraries)
LIBS += \
-lX11 \
-lXext \
LIBS += \
-lX11 \
-lXext \
@@
-361,7
+359,9
@@
LIBS += \
-llzma \
-lfontconfig \
-lfreetype \
-llzma \
-lfontconfig \
-lfreetype \
- $(EXTRA_LIBS)
+
+LIBS += -Wl,--start-group $(thirdparty_libraries) -Wl,--end-group
+LIBS += $(EXTRA_LIBS)
CUTADS = $(OBJDIR)/cutads
CUTOBJ = $(OBJDIR)/cutads.o
CUTADS = $(OBJDIR)/cutads
CUTOBJ = $(OBJDIR)/cutads.o