projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Credit Andrew - add Details of color transfers/primaries, + update x264 from r3106...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
Makefile
diff --git
a/cinelerra-5.1/cinelerra/Makefile
b/cinelerra-5.1/cinelerra/Makefile
index e177049beb68ef7ccd2ab38c7af30c7365312d18..1cb58d504d29479b24f2de84b35f3e7d8681b8d9 100644
(file)
--- a/
cinelerra-5.1/cinelerra/Makefile
+++ b/
cinelerra-5.1/cinelerra/Makefile
@@
-437,7
+437,10
@@
ifeq ($(WANT_CIN_3RDPARTY),no)
LIBS += -lavfilter -lavformat -lavcodec -lavutil
LIBS += -lswresample -lswscale
PLATFORM = $(shell uname -s)
LIBS += -lavfilter -lavformat -lavcodec -lavutil
LIBS += -lswresample -lswscale
PLATFORM = $(shell uname -s)
-ifneq (, $(filter $(PLATFORM), FreeBSD NetBSD))
+ifneq (, $(filter $(PLATFORM), NetBSD))
+LIBS += -lintl
+endif
+ifneq (, $(filter $(PLATFORM), FreeBSD))
LIBS += -lintl -liconv
LIBS += -lexecinfo
endif
LIBS += -lintl -liconv
LIBS += -lexecinfo
endif
@@
-448,6
+451,12
@@
LIBS += `pkg-config --libs uuid 2>/dev/null`
LIBS += `pkg-config --libs theora 2>/dev/null`
LIBS += `pkg-config --libs vorbis 2>/dev/null`
LIBS += `pkg-config --libs sndfile 2>/dev/null`
LIBS += `pkg-config --libs theora 2>/dev/null`
LIBS += `pkg-config --libs vorbis 2>/dev/null`
LIBS += `pkg-config --libs sndfile 2>/dev/null`
+LIBS += `pkg-config --libs x11 2>/dev/null`
+ifeq ($(WANT_DV),yes)
+LIBS += `pkg-config --libs libiec61883 2>/dev/null`
+LIBS += `pkg-config --libs libdv 2>/dev/null`
+LIBS += `pkg-config --libs libavc1394 2>/dev/null`
+endif
ifeq ($(WANT_LIBZMPEG),yes)
LIBS += -la52 -ltwolame -lmp3lame
endif
ifeq ($(WANT_LIBZMPEG),yes)
LIBS += -la52 -ltwolame -lmp3lame
endif
@@
-517,7
+526,7
@@
CFLAGS += -DUSE_ALPHA
else
else
-LDFLAGS1 = -Wl,-export-dynamic -g
+LDFLAGS1 = -Wl,-export-dynamic -g
-Wl,-z,noexecstack
LDFLAGS2 = $(LDFLAGS)
LINKER = $(CXX) -o $(OUTPUT)
LDFLAGS2 = $(LDFLAGS)
LINKER = $(CXX) -o $(OUTPUT)
@@
-535,6
+544,7
@@
all: $(OUTPUT) $(CUTADS) $(BDWRITE) $(LV2UI)
$(OUTPUT): $(OBJS) $(THEME_DATA) $(DCRAW) $(LIBRARIES)
$(LINKER) `cat $(OBJDIR)/objs`
$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(OUTPUT) $(OUTPUT_G))
$(OUTPUT): $(OBJS) $(THEME_DATA) $(DCRAW) $(LIBRARIES)
$(LINKER) `cat $(OBJDIR)/objs`
$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(OUTPUT) $(OUTPUT_G))
+ $(if $(findstring -g,$(CFLAGS)),objcopy --add-gnu-debuglink=$(OUTPUT_G) $(OUTPUT))
$(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT))
ln -f -s ../bin/$(WANT_CIN) ci
$(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT))
ln -f -s ../bin/$(WANT_CIN) ci
@@
-543,6
+553,7
@@
$(CUTADS): $(CUTOBJS) $(CUTLIBS) $(LIBRARIES)
@echo $(CXX) -o $@ $(CUTOBJS)
@$(CXX) $(CFLAGS) -pthread -o $@ $(CUTOBJS) $(CUTLIBS) $(LIBS)
$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(CUTADS) $(CUTADS).debuginfo)
@echo $(CXX) -o $@ $(CUTOBJS)
@$(CXX) $(CFLAGS) -pthread -o $@ $(CUTOBJS) $(CUTLIBS) $(LIBS)
$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(CUTADS) $(CUTADS).debuginfo)
+ $(if $(findstring -g,$(CFLAGS)),objcopy --add-gnu-debuglink=$(CUTADS).debuginfo $(CUTADS))
$(if $(findstring -ggdb,$(CFLAGS)),,strip $(CUTADS))
install-cutads:
$(if $(findstring -ggdb,$(CFLAGS)),,strip $(CUTADS))
install-cutads: