X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2FMakefile;h=965e8316e3044f492d042a949e0cda61d6ce3f3d;hb=541ee122f5f7b959d54e1f891bcbbfce4b209bf7;hp=5822d5a28b80a77b02a56922cfe97b3354307615;hpb=91ee11963ec5a35880e6d715e722fb489b538577;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index 5822d5a2..965e8316 100644
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -441,19 +441,20 @@ ifneq (, $(filter $(PLATFORM), FreeBSD NetBSD))
 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_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)
@@ -483,6 +484,7 @@ LV2OBJS = \
 	$(OBJDIR)/pluginlv2ui.o \
 	$(OBJDIR)/pluginlv2config.o \
 	$(OBJDIR)/forkbase.o
+LIBS += `pkg-config --libs lilv-0`
 endif
 
 CFLAGS := \
@@ -588,6 +590,7 @@ $(OBJDIR)/%.o:		%.C
 ifneq ($(WANT_LV2),no)
 GTK2_INCS := `pkg-config --cflags gtk+-2.0` -Wno-deprecated-declarations
 GTK2_LIBS := `pkg-config --libs gtk+-2.0`
+LV2_LIBS  := `pkg-config --libs lilv-0` `pkg-config --libs suil-0`
 
 $(OBJDIR)/pluginlv2ui.o:	pluginlv2ui.C
 $(OBJDIR)/lv2ui.o:	lv2ui.C
@@ -596,7 +599,7 @@ $(OBJDIR)/pluginlv2ui.o $(OBJDIR)/lv2ui.o:
 
 $(OBJDIR)/lv2ui: $(LV2OBJS)
 	@echo $(CXX) \`cat $(OBJDIR)/c_flags\` $^ -o $@
-	@$(CXX) `cat $(OBJDIR)/c_flags` $^ -o $@ $(LIBS) $(GTK2_LIBS)
+	@$(CXX) `cat $(OBJDIR)/c_flags` $^ -o $@ $(LIBS) $(LV2_LIBS) $(GTK2_LIBS)
 	$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(LV2UI) $(LV2UI).debuginfo)
 	$(if $(findstring -ggdb,$(CFLAGS)),,strip $(LV2UI))