X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2FMakefile;h=d9ff3b933e166f9596a11a57a37ba819ec60465b;hb=5e1bee0d77e4e3997cfb33f1f3602d49cefc256c;hp=5822d5a28b80a77b02a56922cfe97b3354307615;hpb=91ee11963ec5a35880e6d715e722fb489b538577;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile index 5822d5a2..d9ff3b93 100644 --- a/cinelerra-5.1/cinelerra/Makefile +++ b/cinelerra-5.1/cinelerra/Makefile @@ -453,7 +453,7 @@ 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 +483,7 @@ LV2OBJS = \ $(OBJDIR)/pluginlv2ui.o \ $(OBJDIR)/pluginlv2config.o \ $(OBJDIR)/forkbase.o +LIBS += `pkg-config --libs lilv-0` endif CFLAGS := \ @@ -588,6 +589,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 +598,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))