Credit Andrew added returns + vulkan patch

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / Makefile

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index fe3e67a767db76c2507a36d8c7f08923e52a5365..5c35856920de9634381ede4bc0f95413cec345ca 100644 (file)
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -437,23 +437,32 @@ ifeq ($(WANT_CIN_3RDPARTY),no)
 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 += `pkg-config --libs OpenEXR`
-LIBS += `pkg-config --libs flac`
-LIBS += `pkg-config --libs libjpeg`
-LIBS += `pkg-config --libs uuid`
-LIBS += `pkg-config --libs theora`
-LIBS += `pkg-config --libs vorbis`
-LIBS += `pkg-config --libs sndfile`
+LIBS += `pkg-config --libs OpenEXR 2>/dev/null`
+LIBS += `pkg-config --libs flac 2>/dev/null`
+LIBS += `pkg-config --libs libjpeg 2>/dev/null`
+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 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
 LIBS += -lgif -ltheoraenc -ltheoradec -lvorbisfile -lvorbisenc -ltiff
 ifeq ($(shell uname -o), Android)
-LIBS += -landroid-shmem -liconv jpt.a
+LIBS += -landroid-shmem -liconv ../libbthread-master/jpt.a
 endif
 LIBS += $(shared_libs)
 LIBS += $(system_libs)